diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-18 12:14:46 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-18 11:39:32 +0000 |
| commit | 5f4aad3ed2797e1287a269f97009550f35c0e2ca (patch) | |
| tree | 464a778381532860ca2d47949aa0e6e66ff41dad | |
| parent | 845135c62ade3a74a5a3e3d2d7f43ce390c6c716 (diff) | |
QMLANDROID_PREFIX -> MODULE_PREFIX
Change-Id: I94693758d084347100b2a74822ac8c498dddd850
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | features/qmlandroid.prf | 8 | ||||
| -rw-r--r-- | src/android/android.pro | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf index 4b81a4e..0ac9600 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,5 @@ load(qt_build_config) +MODULE_PREFIX = $$PWD MODULE_VERSION = 5.9.0 MODULE_CONFIG = qmlandroid -QMLANDROID_PREFIX = $$PWD diff --git a/features/qmlandroid.prf b/features/qmlandroid.prf index 07b40f3..2a4d7c6 100644 --- a/features/qmlandroid.prf +++ b/features/qmlandroid.prf @@ -1,12 +1,12 @@ -isEmpty(QMLANDROID_PREFIX): \ - QMLANDROID_PREFIX = $$[QT_INSTALL_PREFIX] +isEmpty(MODULE_PREFIX): \ + MODULE_PREFIX = $$[QT_INSTALL_PREFIX] -support_pkg_paths = $$files($$QMLANDROID_PREFIX/src/android/java/support/*) +support_pkg_paths = $$files($$MODULE_PREFIX/src/android/java/support/*) for(path, support_pkg_paths): \ support_pkg_names += $$basename(path) for(pkg, ANDROID_SUPPORT) { - pkg_path = $$QMLANDROID_PREFIX/src/android/java/support/$$pkg + pkg_path = $$MODULE_PREFIX/src/android/java/support/$$pkg !exists($$pkg_path): \ error("Unknown Android support package '$$pkg'. Available packages: $$pkg_names") ANDROID_SUPPORT_INPUT += $$pkg_path diff --git a/src/android/android.pro b/src/android/android.pro index bea15d3..673e066 100644 --- a/src/android/android.pro +++ b/src/android/android.pro @@ -7,7 +7,7 @@ QT += core-private # qjnihelpers CONFIG += c++11 CONFIG -= create_cmake -features.files = $$QMLANDROID_PREFIX/features/qmlandroid.prf +features.files = $$MODULE_PREFIX/features/qmlandroid.prf features.path = $$[QT_HOST_DATA]/mkspecs/features !prefix_build: COPIES += features INSTALLS += features |