diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-20 12:39:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-20 10:57:32 +0000 |
| commit | 6c536617acb53b03be44bcb84767eb2bf35a16a2 (patch) | |
| tree | 4ac7f1063ff234a77531d3d62d1265afff3751b2 | |
| parent | 5b94fe36c9a35dab849517eab7319376648f7d95 (diff) | |
Fix compilation after feature modularization in qtbase
Change-Id: I775e8cac3d7e88686b467e07e62574b43d4b8b71
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 1 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index 25df3c2f8..9eeac75dc 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -129,6 +129,7 @@ defineTest(finalizeConfigure) { production_build:android { addReasonForSkippingBuild("Build not supported on Android.") } + QT_FOR_CONFIG += gui-private production_build:qtConfig(mirclient) { addReasonForSkippingBuild("Build not supported on Ubuntu Touch.") } diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index e425fc46b..328a8be7e 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -48,6 +48,7 @@ defineTest(detectFeatures) { # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt # is using the system libraries, use them to take advantage of the WebCore image decoders as well. + QT_FOR_CONFIG += gui-private qtConfig(system-jpeg): WEBKIT_CONFIG += use_libjpeg else: CONFIGURE_WARNINGS += "Qt not configured to use system libjpeg, QImageDecoder will decode JPEG images" |