diff options
Diffstat (limited to 'Tools/qmake/mkspecs/features/default_pre.prf')
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 54 |
1 files changed, 9 insertions, 45 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index a8bb75830..c91aab9b3 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -16,21 +16,11 @@ load(moc) pro_file = $$_PRO_FILE_ # Checking the variable directly does not work isEmpty(pro_file): CONFIG += recursive_include -# We default to release builds -!build_pass { - CONFIG += release - CONFIG -= debug -} - # Resolve root directories for source and build ROOT_WEBKIT_DIR = $$replace(PWD, /Tools/qmake/mkspecs/features$,) WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},) ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,) -# Detect if we're running the initial configure step -pro_file_name = $$basename(_PRO_FILE_) -equals(pro_file_name, configure.pro): CONFIG += configure_pass - # We want the QtWebKit API forwarding includes to live in the root build dir. MODULE_BASE_DIR = $$ROOT_WEBKIT_DIR MODULE_BASE_OUTDIR = $$ROOT_BUILD_DIR @@ -66,12 +56,6 @@ win32* { isEmpty(pwd_starts_with_slash): CONFIG += win_cmd_shell } -haveQt(4) { - # Make sure QMAKEPATH is set for recursive targets - win_cmd_shell: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE - else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE -} - # Default location of generated sources GENERATED_SOURCES_DESTDIR = generated @@ -92,42 +76,24 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL scratchbox: PYTHON = python2.6 else: PYTHON = python -!haveQt(4, 8):!haveQt(5):!recursive_include: error("Building WebKit with Qt versions older than 4.8 is not supported.") - -!haveQt(5):!no_webkit2 { - root_project_file { - message("Building WebKit2 with Qt versions older than 5.0 is not supported. Disabling WebKit2.") - message("Read http://www.mail-archive.com/webkit-qt@lists.webkit.org/msg01674.html for more information.") - } - CONFIG += no_webkit2 -} +!haveQt(5):!recursive_include: error("Building WebKit with Qt versions older than 5.0 is not supported.") -haveQt(5): { - !haveQtModule(widgets)|!haveQtModule(printsupport) { - root_project_file: message("WebKit1 requires the QtWidgets and QtPrintSupport modules. Disabling WebKit1.") - CONFIG += no_webkit1 - } +!haveQtModule(widgets)|!haveQtModule(printsupport) { + root_project_file: message("WebKit1 requires the QtWidgets and QtPrintSupport modules. Disabling WebKit1.") + CONFIG += no_webkit1 } # We use private_tests to detect developer build, since the destdir will # always be our webkit build dir. This might change as configure changes. contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build -haveQt(4) { - # Qt5 will automatically load the module files for us, but for Qt4 - # we have to do it manually so that the various QT.webkit.foo names - # are available. - include($${ROOT_WEBKIT_DIR}/Tools/qmake/qt_webkit.pri) -} - # Set some defaults for specific platforms CONFIG += include_webinspector # Try to locate sqlite3 source (for WebCore) SQLITE3SRCDIR = $$(SQLITE3SRCDIR) isEmpty(SQLITE3SRCDIR) { - haveQt(5): SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/ - else: SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ + SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/ } # --------- Make features available to JSC ------------ @@ -143,9 +109,7 @@ for(define, DEFINES) { FEATURE_DEFINES_JAVASCRIPT += $$enabled_feature_define } -configure_pass { - # Save the base config and defines so we can compute the delta between - # what features.prf introduced and what was already there. - BASE_CONFIG = $$CONFIG - BASE_DEFINES = $$DEFINES -} +# Save the base config and defines so we can compute the delta between +# what features.prf introduced and what was already there. +BASE_CONFIG = $$CONFIG +BASE_DEFINES = $$DEFINES |