diff options
Diffstat (limited to 'Tools/qmake/mkspecs')
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 8 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/functions.prf | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 6bb52d05a..5c36e9313 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL scratchbox: PYTHON = python2.6 else: PYTHON = python -# We use private_tests to detect developer build, since the destdir will -# always be our webkit build dir. This might change as configure changes. -qtConfig(private_tests): CONFIG += qt_developer_build - # By default we enable "production build", and build-webkit, which is # used by bots and developers, will disable it, to enable warnings etc. CONFIG += production_build @@ -102,9 +98,7 @@ gcc:isEqual(QT_ARCH, "arm"): CONFIG -= use_gold_linker # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { - qtConfig(simulator_and_device): CONFIG += simulator_and_device - qtConfig(debug_and_release): CONFIG += debug_and_release - qtConfig(build_all): CONFIG += build_all + qtConfig(debug_and_release): CONFIG += debug_and_release build_all } FLEX = flex diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf index dc0c78f97..2f5b87c7c 100644 --- a/Tools/qmake/mkspecs/features/functions.prf +++ b/Tools/qmake/mkspecs/features/functions.prf @@ -293,7 +293,7 @@ defineTest(linkAgainstLibrary) { } defineTest(xlibAvailable) { - contains(QT_CONFIG, xcb-xlib) { + qtConfig(xcb):qtConfig(xcb-xlib) { return(true) } else { return(false) |