diff options
| author | Paul Olav Tvete <paul.tvete@digia.com> | 2013-03-11 12:55:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 18:13:37 +0100 |
| commit | 79d4f5b6280f9b440e4fe77177823fd8480d5e12 (patch) | |
| tree | 43cb7cce8da9a63acad93911ceedcce0693e573a /src/android | |
| parent | 08343e41a07d6144da5577aab115ff47c4585a58 (diff) | |
Android: install java-related files
The jar files are deployed on the device. The files in the java directory
are used by creator when making a new project.
Change-Id: Ie59f40edaa9c10044a1ca9949808ee22e6622ea1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/android.pro | 17 | ||||
| -rw-r--r-- | src/android/jar/jar.pro | 19 | ||||
| -rw-r--r-- | src/android/java/java.pro | 8 |
3 files changed, 29 insertions, 15 deletions
diff --git a/src/android/android.pro b/src/android/android.pro index 049a51904c..a5db78e32f 100644 --- a/src/android/android.pro +++ b/src/android/android.pro @@ -1,15 +1,2 @@ -CONFIG += java -TARGET = QtAndroid -DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar - -PATHPREFIX = $$PWD/jar/src/org/qtproject/qt5/android/ - -JAVACLASSPATH += $$PWD/jar/src/ -JAVASOURCES += \ - $$PATHPREFIX/QtActivityDelegate.java \ - $$PATHPREFIX/QtEditText.java \ - $$PATHPREFIX/QtInputConnection.java \ - $$PATHPREFIX/QtLayout.java \ - $$PATHPREFIX/QtNative.java \ - $$PATHPREFIX/QtNativeLibrariesDir.java \ - $$PATHPREFIX/QtSurface.java +TEMPLATE = subdirs +SUBDIRS = jar java diff --git a/src/android/jar/jar.pro b/src/android/jar/jar.pro new file mode 100644 index 0000000000..1955f16142 --- /dev/null +++ b/src/android/jar/jar.pro @@ -0,0 +1,19 @@ +CONFIG += java +TARGET = QtAndroid +DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar + +PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/ + +JAVACLASSPATH += $$PWD/src/ +JAVASOURCES += \ + $$PATHPREFIX/QtActivityDelegate.java \ + $$PATHPREFIX/QtEditText.java \ + $$PATHPREFIX/QtInputConnection.java \ + $$PATHPREFIX/QtLayout.java \ + $$PATHPREFIX/QtNative.java \ + $$PATHPREFIX/QtNativeLibrariesDir.java \ + $$PATHPREFIX/QtSurface.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target diff --git a/src/android/java/java.pro b/src/android/java/java.pro new file mode 100644 index 0000000000..fe5bf2f62b --- /dev/null +++ b/src/android/java/java.pro @@ -0,0 +1,8 @@ +javaresources.files = \ + $$PWD/AndroidManifest.xml \ + $$PWD/res \ + $$PWD/src + +javaresources.path = $$[QT_INSTALL_PREFIX]/src/android/java + +INSTALLS += javaresources |