summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2013-03-22 15:12:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-22 16:34:07 +0100
commit9c6f27ce489cd12f7d1cab3ca15178350e544082 (patch)
tree78688b88877a2b21594363eef4d6cf44303416e4
parentab340e89fdf15639e062313815fc7c534676c23c (diff)
Fix installation of Android java files
The installation of the java files does not depend on Qt, so it can be built before the rest of Qt, which means we need to remove the default dependency in qmake, otherwise we can get an error message: Project ERROR: Unknown module(s) in QT: gui core Change-Id: Ibb968acf6ec06c91ccfd5002e08c93c96a209934 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--src/android/java/java.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/android/java/java.pro b/src/android/java/java.pro
index fe5bf2f62b..2b6ac16a3c 100644
--- a/src/android/java/java.pro
+++ b/src/android/java/java.pro
@@ -1,3 +1,5 @@
+CONFIG -= qt
+
javaresources.files = \
$$PWD/AndroidManifest.xml \
$$PWD/res \