diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/functions.prf | 7 | ||||
| -rw-r--r-- | mkspecs/features/gn_generator.prf | 8 | ||||
| -rw-r--r-- | mkspecs/features/platform.prf | 23 |
4 files changed, 24 insertions, 18 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index c3ae7df8d..0721bdd2c 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -27,8 +27,8 @@ defineTest(runConfigure) { return(false) } - include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) - QT_FOR_CONFIG += webengine-private + include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) + QT_FOR_CONFIG += webenginecore-private !qtConfig(webengine-v8-snapshot-support):qtConfig(webengine-v8-snapshot) { skipBuild("V8 snapshot cannot be built. Most likely, the 32-bit host compiler does not work."\ diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 8564bad8a..a26f1258d 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -70,17 +70,14 @@ defineReplace(ninjaPath) { defineReplace(gnPath) { src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT") - out = $$shadowed($$absolute_path(chromium/tools/gn/out/Release/gn, $$src_3rd_party_dir)) + out = $$shadowed($$absolute_path(gn/out/Release/gn, $$src_3rd_party_dir)) win32: out = $${out}.exe return($$out) } defineReplace(gnArgs) { - linux { - qtConfig(webengine-embedded-build): include($$QTWEBENGINE_ROOT/src/core/config/embedded_linux.pri) - else: include($$QTWEBENGINE_ROOT/src/core/config/desktop_linux.pri) - } + linux: include($$QTWEBENGINE_ROOT/src/core/config/linux.pri) macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri) win32: include($$QTWEBENGINE_ROOT/src/core/config/windows.pri) isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf index efb8a65a1..b1f04e570 100644 --- a/mkspecs/features/gn_generator.prf +++ b/mkspecs/features/gn_generator.prf @@ -222,6 +222,14 @@ GN_CONTENTS += " \":generate_cpp_mocs\"," GN_CONTENTS += " ]" GN_CONTENTS += " }" GN_CONTENTS += "}" +GN_CONTENTS += " if (!defined(core_include_dirs)) {"\ + " core_include_dirs = []"\ + " }" +!isEmpty(GN_CORE_INCLUDE_DIRS) { + GN_CONTENTS += "core_include_dirs += [" + for (inc, GN_CORE_INCLUDE_DIRS): GN_CONTENTS += " \"$$inc\"," + GN_CONTENTS += "]" +} !isEmpty(GN_INCLUDES) { for (inc, GN_INCLUDES): GN_CONTENTS += $$cat($$inc,lines) } diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index c790c9fa6..0a2e4b1ef 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -1,5 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) -QT_FOR_CONFIG += webengine-private +include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) +QT_FOR_CONFIG += webenginecore-private defineTest(isQtMinimum) { !equals(QT_MAJOR_VERSION, $$1): return(false) @@ -29,8 +29,8 @@ defineTest(isPlatformSupported) { skipBuild("Qt WebEngine on Windows requires MSVC.") return(false) } - !isMinWinSDKVersion(10, 10586): { - skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.10586 or newer.") + !isMinWinSDKVersion(10, 16299): { + skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.16299 or newer.") return(false) } !qtConfig(webengine-winversion) { @@ -38,22 +38,23 @@ defineTest(isPlatformSupported) { return(false) } } else:osx { - !isMinXcodeVersion(7, 3) { - skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.") + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + lessThan(QMAKE_XCODE_VERSION, 8.3.3) { + skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") return(false) } !clang|intel_icc { skipBuild("Qt WebEngine on macOS requires Clang.") return(false) } - # We require macOS 10.11 (darwin version 15.0.0) or newer. + # We require macOS 10.12 (darwin version 16.0.0) or newer. darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 15) { - skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.") + lessThan(darwin_major_version, 16) { + skipBuild("Building Qt WebEngine requires macOS version 10.12 or newer.") return(false) } - !isMinOSXSDKVersion(10, 10): { - skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") + !isMinOSXSDKVersion(10, 12): { + skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") return(false) } } else { |