summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGábor Péterffy <[email protected]>2015-07-12 17:37:30 +0200
committerGábor Péterffy <[email protected]>2015-07-12 17:37:30 +0200
commitdcdeae94cb1637ca708bb5854d7486fe711639ec (patch)
treeb42f65f405ae11d7d249a8dc0dac4e654b586412
parent20a691ee3365822fcfa33a6d71739acb66542ddb (diff)
REVIEW: 124217
Changed mable_android to marble_maps
-rw-r--r--data/android/AndroidManifest_MarbleMaps.xml.in33
-rw-r--r--data/android/drawable-hdpi/marblelogo.pngbin0 -> 8683 bytes
-rw-r--r--data/android/drawable-ldpi/marblelogo.pngbin0 -> 2919 bytes
-rw-r--r--data/android/drawable-mdpi/marblelogo.pngbin0 -> 4758 bytes
-rw-r--r--data/android/drawable-xhdpi/marblelogo.pngbin0 -> 13213 bytes
-rw-r--r--data/android/drawable-xxhdpi/marblelogo.pngbin0 -> 23574 bytes
-rw-r--r--data/android/drawable-xxxhdpi/marblelogo.pngbin0 -> 35218 bytes
-rw-r--r--src/apps/CMakeLists.txt2
-rw-r--r--src/apps/marble_android/CMakeLists.txt23
-rw-r--r--src/apps/marble_maps/CMakeLists.txt28
-rw-r--r--src/apps/marble_maps/main.cpp (renamed from src/apps/marble_android/main.cpp)0
11 files changed, 62 insertions, 24 deletions
diff --git a/data/android/AndroidManifest_MarbleMaps.xml.in b/data/android/AndroidManifest_MarbleMaps.xml.in
new file mode 100644
index 0000000..ec7d4ea
--- /dev/null
+++ b/data/android/AndroidManifest_MarbleMaps.xml.in
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<manifest android:versionName="@[email protected]" package="@[email protected]" android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="@[email protected]">
+ <application android:label="@[email protected]" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/marblelogo">
+ <activity android:label="@[email protected]" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:screenOrientation="unspecified" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+ <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+ <meta-data android:name="android.app.repository" android:value="default"/>
+ <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+ <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+ <!-- Deploy Qt libs as part of package -->
+ <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
+ <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
+ <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
+ <!-- Run with local libs -->
+ <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
+ <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+ <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
+ <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
+ <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
+ <!-- Messages maps -->
+ <meta-data android:name="android.app.ministro_not_found_msg" android:value="@string/ministro_not_found_msg"/>
+ <meta-data android:name="android.app.ministro_needed_msg" android:value="@string/ministro_needed_msg"/>
+ <meta-data android:name="android.app.fatal_error_msg" android:value="@string/fatal_error_msg"/>
+ </activity>
+ </application>
+ <supports-screens android:anyDensity="true" android:normalScreens="true" android:smallScreens="true" android:largeScreens="true"/>
+ <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/>
+ <uses-permission android:name="android.permission.INTERNET" />
+</manifest> \ No newline at end of file
diff --git a/data/android/drawable-hdpi/marblelogo.png b/data/android/drawable-hdpi/marblelogo.png
new file mode 100644
index 0000000..2d3368e
--- /dev/null
+++ b/data/android/drawable-hdpi/marblelogo.png
Binary files differ
diff --git a/data/android/drawable-ldpi/marblelogo.png b/data/android/drawable-ldpi/marblelogo.png
new file mode 100644
index 0000000..eb812d7
--- /dev/null
+++ b/data/android/drawable-ldpi/marblelogo.png
Binary files differ
diff --git a/data/android/drawable-mdpi/marblelogo.png b/data/android/drawable-mdpi/marblelogo.png
new file mode 100644
index 0000000..269f108
--- /dev/null
+++ b/data/android/drawable-mdpi/marblelogo.png
Binary files differ
diff --git a/data/android/drawable-xhdpi/marblelogo.png b/data/android/drawable-xhdpi/marblelogo.png
new file mode 100644
index 0000000..b574610
--- /dev/null
+++ b/data/android/drawable-xhdpi/marblelogo.png
Binary files differ
diff --git a/data/android/drawable-xxhdpi/marblelogo.png b/data/android/drawable-xxhdpi/marblelogo.png
new file mode 100644
index 0000000..74c2507
--- /dev/null
+++ b/data/android/drawable-xxhdpi/marblelogo.png
Binary files differ
diff --git a/data/android/drawable-xxxhdpi/marblelogo.png b/data/android/drawable-xxxhdpi/marblelogo.png
new file mode 100644
index 0000000..bf462f7
--- /dev/null
+++ b/data/android/drawable-xxxhdpi/marblelogo.png
Binary files differ
diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
index 1d7cb40..9725ae1 100644
--- a/src/apps/CMakeLists.txt
+++ b/src/apps/CMakeLists.txt
@@ -7,5 +7,5 @@ if (NOT ANDROID)
add_subdirectory(marble-touch)
endif( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
else()
- add_subdirectory(marble_android)
+ add_subdirectory(marble_maps)
endif()
diff --git a/src/apps/marble_android/CMakeLists.txt b/src/apps/marble_android/CMakeLists.txt
deleted file mode 100644
index 531c8a6..0000000
--- a/src/apps/marble_android/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-set(marble_SRCS main.cpp)
-marble_qt4_automoc(${marble_SRCS})
-
-add_library (marble_android SHARED ${marble_SRCS})
-set_target_properties(marble_android PROPERTIES VERSION 0.0.1)
-
-target_link_libraries (
- marble_android
- ${Qt5Core_LIBRARIES}
- ${Qt5Xml_LIBRARIES}
- ${Qt5Widgets_LIBRARIES}
- ${Qt5PrintSupport_LIBRARIES}
- ${Qt5Network_LIBRARIES}
- ${Qt5WebKitWidgets_LIBRARIES}
- ${Qt5WebKit_LIBRARIES}
- ${MARBLEWIDGET}
- astro)
-
-file(COPY "../../../data" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_android/assets")
-
-include(../../../qt-android-cmake/AddQtAndroidApk.cmake)
-add_qt_android_apk(marble_android_apk marble_android DEPENDS "../../../../build/src/lib/marble/libmarblewidget-qt5.so" "../../../../build/src/lib/astro/libastro.so")
-
diff --git a/src/apps/marble_maps/CMakeLists.txt b/src/apps/marble_maps/CMakeLists.txt
new file mode 100644
index 0000000..f6d616f
--- /dev/null
+++ b/src/apps/marble_maps/CMakeLists.txt
@@ -0,0 +1,28 @@
+set(marble_SRCS main.cpp)
+marble_qt4_automoc(${marble_SRCS})
+
+add_library (Marble SHARED ${marble_SRCS})
+set_target_properties(Marble PROPERTIES VERSION 1.0)
+
+target_link_libraries (
+ Marble
+ ${Qt5Core_LIBRARIES}
+ ${Qt5Xml_LIBRARIES}
+ ${Qt5Widgets_LIBRARIES}
+ ${Qt5PrintSupport_LIBRARIES}
+ ${Qt5Network_LIBRARIES}
+ ${Qt5WebKitWidgets_LIBRARIES}
+ ${Qt5WebKit_LIBRARIES}
+ ${MARBLEWIDGET}
+ astro)
+
+file(COPY "../../../data" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/assets")
+file(COPY "../../../data/android/drawable-ldpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
+file(COPY "../../../data/android/drawable-mdpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
+file(COPY "../../../data/android/drawable-hdpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
+file(COPY "../../../data/android/drawable-xhdpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
+file(COPY "../../../data/android/drawable-xxhdpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
+file(COPY "../../../data/android/drawable-xxxhdpi" DESTINATION "${CMAKE_BINARY_DIR}/src/apps/marble_maps/res")
+
+include(../../../qt-android-cmake/AddQtAndroidApk.cmake)
+add_qt_android_apk(Marble_apk Marble DEPENDS "../../../../build/src/lib/marble/libmarblewidget-qt5.so" "../../../../build/src/lib/astro/libastro.so" NAME "Marble Maps" PACKAGE_NAME "org.kde.marble.maps") \ No newline at end of file
diff --git a/src/apps/marble_android/main.cpp b/src/apps/marble_maps/main.cpp
index 737b8b8..737b8b8 100644
--- a/src/apps/marble_android/main.cpp
+++ b/src/apps/marble_maps/main.cpp