diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2018-01-11 05:56:18 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 10:25:26 +0000 |
| commit | 79143ccfc158ec4fffc49eee600d600edb342b16 (patch) | |
| tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Tools | |
| parent | cb895f50d5c08976c0f5ecbb82e6bd19d9ea090d (diff) | |
Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8
Change-Id: I66add69e6d08b74111ec8e7e4401e4d813501206
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index fadfda059..f63fcd658 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -25,11 +25,10 @@ build_pass|!debug_and_release { USE_LIBHYPHEN=OFF !isEmpty(_QMAKE_SUPER_CACHE_) { - CMAKE_PREFIX_PATH=\"$$ROOT_QT_BUILD_DIR/qtbase;$$ROOT_QT_BUILD_DIR/qtlocation;$$ROOT_QT_BUILD_DIR/qtsensors;$$ROOT_QT_BUILD_DIR/qtdeclarative;$$ROOT_QT_BUILD_DIR/qtwebchannel\" + CMAKE_CONFIG += CMAKE_PREFIX_PATH=\"$$ROOT_QT_BUILD_DIR/qtbase;$$ROOT_QT_BUILD_DIR/qtlocation;$$ROOT_QT_BUILD_DIR/qtsensors;$$ROOT_QT_BUILD_DIR/qtdeclarative;$$ROOT_QT_BUILD_DIR/qtwebchannel\" } else { - CMAKE_PREFIX_PATH=\"$$[QT_INSTALL_PREFIX]\" + CMAKE_CONFIG += Qt5_DIR=\"$$[QT_INSTALL_LIBS]/cmake/Qt5\" } - CMAKE_CONFIG += CMAKE_PREFIX_PATH=$$CMAKE_PREFIX_PATH static: CMAKE_CONFIG += USE_THIN_ARCHIVES=OFF |