diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-09-12 15:05:42 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-09-16 11:35:22 +0000 |
| commit | 0310740f7bbd6f52086cd465c10e1f6b21fa828b (patch) | |
| tree | 983f7889a12f24d8d5b14cfd108eeeb10cbeec02 | |
| parent | a6e29d8c3ea8a3f2530761f5db1ae1f620655d6a (diff) | |
Prepare for configure modularization in qtbase
This ensures we will find the features also after the
modularization change in qtbase.
Change-Id: I34d4eecbc51335c59e0e1d5d8de4149487fd07b6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | src/core/config/linux.pri | 1 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 1 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index a51a703bb..5fa93e819 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -1,4 +1,5 @@ include(common.pri) +QT_FOR_CONFIG += gui-private # linux_use_bundled_gold currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug) # Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system. diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 597a6d9d3..89fa3a242 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -21,6 +21,7 @@ defineTest(runConfigure) { } linux { + QT_FOR_CONFIG += gui-private !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") REQUIRED_PACKAGES = dbus-1 fontconfig diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index f6d4f676b..d109e2859 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -14,6 +14,7 @@ defineTest(isQtMinimum) { } defineTest(isPlatformSupported) { + QT_FOR_CONFIG += gui-private linux { !gcc:!clang { skipBuild("Qt WebEngine on Linux requires clang or GCC.") |