Commit 29c67d24 authored by Sergey Galin's avatar Sergey Galin

[VNA-4] Finish renaming

parent 59763308
......@@ -11,5 +11,4 @@ build.xml
local.properties
project.properties
proguard-project.txt
Samples/AndroidWebView/src/org/qt
qrc_*
*.moc
moc_*
*.o
*.so
*.user
bin/*
gen/*
Makefile
build.xml
local.properties
project.properties
proguard-project.txt
src/org/qt
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.animatedtiles"
package="ru.dublgis.androidwebviewdemo"
android:installLocation="auto"
android:versionCode="1"
android:versionName="1.0">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<!-- android:hardwareAccelerated="false" -->
<activity
android:name="QtAnimatedTiles"
android:name="AndroidWebViewDemo"
android:label="@string/app_name"
android:theme="@style/myStyleTheme"
android:windowSoftInputMode="stateUnchanged"
......
......@@ -9,7 +9,7 @@ SOURCES = \
GrymQtAndroidViewGraphicsProxy.cpp \
QOpenGLTextureHolder.cpp
RESOURCES = animatedtiles.qrc
RESOURCES = resources.qrc
INCLUDEPATH += JNIUtils
......@@ -19,7 +19,7 @@ android-g++ {
# exported nor used inside of the application.
QMAKE_CXXFLAGS += -fvisibility=hidden
CONFIG += dll
TARGET = /../../libs/armeabi/libanimatedtiles
TARGET = /../../libs/armeabi/libandroidwebviewdemo
}
include("JNIUtils/JNIUtils.pri")
......
......@@ -270,7 +270,7 @@ int main(int argc, char **argv)
// qDebug()<<"main "<<argc<<","<<argv[0]<<argv[1];
qDebug()<<TAG<<"Init resource...";
Q_INIT_RESOURCE(animatedtiles);
Q_INIT_RESOURCE(resources);
qDebug()<<TAG<<"Construct QApplication...";
QApplication::setGraphicsSystem(QLatin1String("opengl"));
......
......@@ -14,5 +14,5 @@ cd ..
ant debug install || exit 1
echo "Starting app..."
adb shell am start -n org.animatedtiles/org.animatedtiles.QtAnimatedTiles
adb shell am start -n ru.dublgis.androidwebviewdemo/ru.dublgis.androidwebviewdemo.AndroidWebViewDemo
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">QtAnimatedTiles</string>
<string name="app_name">Qt WebView Demo</string>
</resources>
package org.animatedtiles;
package ru.dublgis.androidwebviewdemo;
import android.content.pm.ActivityInfo;
......@@ -8,14 +8,14 @@ import org.qt.core.QtApplicationBase;
import org.qt.core.QtLibraryLoader;
import org.qt.lite.QtActivity;
public class QtAnimatedTiles extends QtActivity
public class AndroidWebViewDemo extends QtActivity
{
private static boolean mSplashHasBeenCreatedOnce = false;
public QtAnimatedTiles()
public AndroidWebViewDemo()
{
super("animatedtiles"); // Name of the library containing your Qt application
// (without "lib" and ".so")
super("androidwebviewdemo"); // Name of the library containing your Qt application
// (without "lib" and ".so")
// You could add more libraries here, e.g.:
// addLibrary("QtNetwork");
......@@ -30,7 +30,6 @@ public class QtAnimatedTiles extends QtActivity
setKeepaliveService(true);
QtLibraryLoader.addLibrary("QtOpenGL");
setEnableOpenGlModeFor(2, 0, 4);
//setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
if (!mSplashHasBeenCreatedOnce)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment