diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-12-14 22:39:30 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-12-21 17:42:22 +0000 |
| commit | 8cab1238d6ea14fa6a61ed4e0c5d39ccd0736ec2 (patch) | |
| tree | 79f0a9f1e95dc80ba9b0d5cfaab9edddf27ec73f /Tools | |
| parent | 35655d5f4bad248ead1700b59c381cc568b4e98b (diff) | |
Import WebKit commit 3b024218447b7838f08ccd8cf2c8515387ae41c2
Change-Id: I0698c3862a53268111308c191c45167e36898dbb
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/mkspecs/features/functions.prf | 2 | ||||
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf index 3699d6b71..e3f42cec4 100644 --- a/Tools/qmake/mkspecs/features/functions.prf +++ b/Tools/qmake/mkspecs/features/functions.prf @@ -65,6 +65,8 @@ defineTest(isPlatformSupported) { skipBuild("Using cmake version $$cmake_version, but at least cmake 2.8.12 is required to build QtWebKit.") } + intel_icc: skipBuild("Building QtWebKit with ICC is not supported.") + win32 { winrt { skipBuild("WinRT is not supported.") diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index b15bd9266..74579c57e 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -39,8 +39,12 @@ build_pass|!debug_and_release { !qtConfig(system-jpeg):exists($$QTBASE_DIR) { CMAKE_CONFIG += \ QT_BUNDLED_JPEG=1 \ - JPEG_INCLUDE_DIR=$$QTBASE_DIR/src/3rdparty/libjpeg \ JPEG_LIBRARIES=$$staticLibPath(qtjpeg) + + exists($$QTBASE_DIR/src/3rdparty/libjpeg/src/jpeglib.h): \ + CMAKE_CONFIG += JPEG_INCLUDE_DIR=$$QTBASE_DIR/src/3rdparty/libjpeg/src + else: \ + CMAKE_CONFIG += JPEG_INCLUDE_DIR=$$QTBASE_DIR/src/3rdparty/libjpeg } !qtConfig(system-png):qtConfig(png):exists($$QTBASE_DIR) { |