summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/jar/bundledjar.pro3
-rw-r--r--src/jar/distributedjar.pro2
-rw-r--r--src/jar/jar.pri11
-rw-r--r--src/jar/jar.pro14
-rw-r--r--src/webview/webview-lib.pri2
5 files changed, 12 insertions, 20 deletions
diff --git a/src/jar/bundledjar.pro b/src/jar/bundledjar.pro
deleted file mode 100644
index abe173b..0000000
--- a/src/jar/bundledjar.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET = QtAndroidWebView-bundled
-CONFIG += bundled_jar_file
-include(jar.pri)
diff --git a/src/jar/distributedjar.pro b/src/jar/distributedjar.pro
deleted file mode 100644
index 710983e..0000000
--- a/src/jar/distributedjar.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = QtAndroidWebView
-include(jar.pri)
diff --git a/src/jar/jar.pri b/src/jar/jar.pri
deleted file mode 100644
index 0c4f499..0000000
--- a/src/jar/jar.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-load(qt_build_paths)
-CONFIG += java
-DESTDIR = $$MODULE_BASE_OUTDIR/jar
-
-JAVACLASSPATH += $$PWD/src
-
-JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java
-
-# install
-target.path = $$[QT_INSTALL_PREFIX]/jar
-INSTALLS += target
diff --git a/src/jar/jar.pro b/src/jar/jar.pro
index 6a4fcd3..c432dc0 100644
--- a/src/jar/jar.pro
+++ b/src/jar/jar.pro
@@ -1,3 +1,13 @@
-TEMPLATE=subdirs
-SUBDIRS += distributedjar.pro bundledjar.pro
+TARGET = QtAndroidWebView
+load(qt_build_paths)
+CONFIG += java
+DESTDIR = $$MODULE_BASE_OUTDIR/jar
+
+JAVACLASSPATH += $$PWD/src
+
+JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java
+
+# install
+target.path = $$[QT_INSTALL_PREFIX]/jar
+INSTALLS += target
diff --git a/src/webview/webview-lib.pri b/src/webview/webview-lib.pri
index f5d6774..0731f87 100644
--- a/src/webview/webview-lib.pri
+++ b/src/webview/webview-lib.pri
@@ -1,6 +1,4 @@
ANDROID_BUNDLED_JAR_DEPENDENCIES = \
- jar/QtAndroidWebView-bundled.jar
-ANDROID_JAR_DEPENDENCIES = \
jar/QtAndroidWebView.jar
ANDROID_PERMISSIONS = \
android.permission.ACCESS_FINE_LOCATION