diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-06 18:19:11 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-07-06 18:19:11 +0000 |
| commit | 3aa126cc29b2c0093f5d2e5e2fa63f59670f7b75 (patch) | |
| tree | 4711495f6f5ca58245d2f75a796ae538839ee1c4 /mkspecs | |
| parent | ce1964ddcff9a213ad33fc8ba3a35b6d4322fadf (diff) | |
| parent | 8f160af577e4d979954a63ab56f56e4d0c8ad0f8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/functions.prf | 10 | ||||
| -rw-r--r-- | mkspecs/features/gn_generator.prf | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index a07171b3e..6de9efe93 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -146,10 +146,6 @@ defineTest(runConfigure) { cache(WEBENGINE_CONFIG, add, $$list($$WEBENGINE_CONFIG)) export(WEBENGINE_CONFIG) } - # Set a global WEBENGINE_ARCH for the target architecture we can also read from option(host_build) - WEBENGINE_ARCH = $$QT_ARCH - cache(WEBENGINE_ARCH) - export(WEBENGINE_ARCH) } unix:!darwin { diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 8dd21f410..56894e58a 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -16,7 +16,7 @@ defineTest(isQtMinimum) { defineTest(isPlatformSupported) { QT_FOR_CONFIG += gui-private linux { - !gcc:!clang { + if(!gcc:!clang)|intel_icc { skipBuild("Qt WebEngine on Linux requires clang or GCC.") return(false) } @@ -29,6 +29,10 @@ defineTest(isPlatformSupported) { isBuildingOnWin32() { skipBuild("Qt WebEngine on Windows must be built on a 64-bit machine.") } + !msvc|intel_icl { + 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.") return(false) @@ -38,6 +42,10 @@ defineTest(isPlatformSupported) { skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") return(false) } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") + return(false) + } # We require OS X 10.0 (darwin version 14.0.0) or newer darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) lessThan(darwin_major_version, 14) { diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf index 1f730acd0..b2b749154 100644 --- a/mkspecs/features/gn_generator.prf +++ b/mkspecs/features/gn_generator.prf @@ -186,8 +186,7 @@ for (flag, QMAKE_LFLAGS): GN_CONTENTS += " \"$$filter_flag_values($$flag)\"," for (flag, GN_FLAGS): GN_CONTENTS += " \"$$flag\"," !isEmpty(QMAKE_RPATHDIR) { for (rpath, QMAKE_RPATHDIR) { - macos: GN_CONTENTS += " \"-Wl,-rpath,$${rpath}\"," - else:unix: GN_CONTENTS += " \"-Wl,-rpath=$${rpath}\"," + unix:!macos: GN_CONTENTS += " \"-Wl,-rpath=$${rpath}\"," } } !isEmpty(QMAKE_RPATHLINKDIR): GN_CONTENTS += " \"-Wl,-rpath-link=$${QMAKE_RPATHLINKDIR}\"," |