diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:36:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:39:20 +0100 |
| commit | 6755ec891a1740110c48895afd53d39e8370704a (patch) | |
| tree | 982606f3bc582262e4b315a63f55ccb141fff97b /configure.json | |
| parent | 449204f8c0d6679ae0e58dbb8a30b8a86fbdb4ec (diff) | |
| parent | 00c9ec63a552d040e851b561c11428fabf1a2b08 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure
qmake/Makefile.unix.macos
qmake/Makefile.unix.win32
qmake/generators/win32/msvc_vcproj.cpp
src/3rdparty/pcre/qt_attribution.json
src/corelib/io/qsettings.cpp
src/corelib/kernel/qdeadlinetimer.cpp
src/platformsupport/kmsconvenience/qkmsdevice.cpp
src/platformsupport/kmsconvenience/qkmsdevice_p.h
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
tests/manual/qstorageinfo/printvolumes.cpp
tools/configure/configureapp.cpp
Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 6b44867b79..1bf59eb71d 100644 --- a/configure.json +++ b/configure.json @@ -56,6 +56,7 @@ "android-toolchain-version": "string", "accessibility": "boolean", + "android-style-assets": "boolean", "avx": "boolean", "avx2": "boolean", "avx512": { "type": "boolean", "name": "avx512f" }, @@ -417,6 +418,12 @@ }, "features": { + "android-style-assets": { + "label": "Android Style Assets", + "condition": "config.android", + "output": [ "privateFeature" ], + "comment": "This belongs into gui, but the license check needs it here already." + }, "shared": { "label": "Building shared libraries", "autoDetect": "!config.uikit", @@ -516,7 +523,7 @@ }, "release_tools": { "label": "Compile tools in release mode", - "autoDetect": "!features.debug", + "autoDetect": "features.debug", "output": [ "privateFeature", "publicQtConfig" ] }, "simulator_and_device": { @@ -965,6 +972,11 @@ "earlyReport": [ { + "type": "fatal", + "condition": "!call.licenseCheck", + "message": "You are not licensed to use this software." + }, + { "type": "warning", "condition": "input.debug_and_release == 'yes' && !config.darwin && !config.win32", "message": "-debug-and-release is only supported on Darwin and Windows platforms. |