diff options
Diffstat (limited to 'src/android/nfc')
-rw-r--r-- | src/android/nfc/bundledjar.pro | 3 | ||||
-rw-r--r-- | src/android/nfc/distributedjar.pro | 2 | ||||
-rw-r--r-- | src/android/nfc/nfc.pri | 12 | ||||
-rw-r--r-- | src/android/nfc/nfc.pro | 15 |
4 files changed, 13 insertions, 19 deletions
diff --git a/src/android/nfc/bundledjar.pro b/src/android/nfc/bundledjar.pro deleted file mode 100644 index 37f7fc82..00000000 --- a/src/android/nfc/bundledjar.pro +++ /dev/null @@ -1,3 +0,0 @@ -TARGET = QtNfc-bundled -CONFIG += bundled_jar_file -include(nfc.pri) diff --git a/src/android/nfc/distributedjar.pro b/src/android/nfc/distributedjar.pro deleted file mode 100644 index ed65c50a..00000000 --- a/src/android/nfc/distributedjar.pro +++ /dev/null @@ -1,2 +0,0 @@ -TARGET = QtNfc -include(nfc.pri) diff --git a/src/android/nfc/nfc.pri b/src/android/nfc/nfc.pri deleted file mode 100644 index 3f6e26aa..00000000 --- a/src/android/nfc/nfc.pri +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += java -DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar - -PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/nfc - -JAVACLASSPATH += $$PWD/src/ -JAVASOURCES += \ - $$PWD/src/org/qtproject/qt5/android/nfc/QtNfc.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target diff --git a/src/android/nfc/nfc.pro b/src/android/nfc/nfc.pro index 70373fe1..89026b75 100644 --- a/src/android/nfc/nfc.pro +++ b/src/android/nfc/nfc.pro @@ -1,3 +1,14 @@ -TEMPLATE = subdirs -SUBDIRS += bundledjar.pro distributedjar.pro +TARGET = QtNfc +CONFIG += java +DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar + +PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/nfc + +JAVACLASSPATH += $$PWD/src/ +JAVASOURCES += \ + $$PWD/src/org/qtproject/qt5/android/nfc/QtNfc.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target |