summaryrefslogtreecommitdiffstats
path: root/Tools/qmake/projects/run_cmake.pro
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2018-01-07 19:43:21 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2018-01-07 17:08:48 +0000
commitcb895f50d5c08976c0f5ecbb82e6bd19d9ea090d (patch)
treefd8632d48c2ee72747feaa0e2b458d591e254288 /Tools/qmake/projects/run_cmake.pro
parent8cab1238d6ea14fa6a61ed4e0c5d39ccd0736ec2 (diff)
Import WebKit commit 69d327017a8d700cbfc7e1120270db4d55416f41
Change-Id: I38406c67ba681f7693a45b0fa2d8c2e44a6d9a0e Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools/qmake/projects/run_cmake.pro')
-rw-r--r--Tools/qmake/projects/run_cmake.pro4
1 files changed, 0 insertions, 4 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro
index 74579c57e..fadfda059 100644
--- a/Tools/qmake/projects/run_cmake.pro
+++ b/Tools/qmake/projects/run_cmake.pro
@@ -62,10 +62,6 @@ build_pass|!debug_and_release {
else: CMAKE_CONFIG += ZLIB_INCLUDE_DIRS=$$QTBASE_DIR/src/3rdparty/zlib
}
- qtConfig(opengles2):!qtConfig(dynamicgl) {
- CMAKE_CONFIG += QT_USES_GLES2_ONLY=1
- }
-
exists($$ROOT_BUILD_DIR/conanbuildinfo.cmake):exists($$ROOT_BUILD_DIR/conanfile.txt) {
CMAKE_CONFIG += QT_CONAN_DIR=$$ROOT_BUILD_DIR
}