From 79143ccfc158ec4fffc49eee600d600edb342b16 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 11 Jan 2018 05:56:18 +0300 Subject: Import WebKit commit a8b574fb3cd509a2d3f2a1568ad0a66d1bf0f6e8 Change-Id: I66add69e6d08b74111ec8e7e4401e4d813501206 Reviewed-by: Konstantin Tokarev --- Tools/qmake/projects/run_cmake.pro | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Tools') 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 -- cgit v1.2.3