summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2023-05-12 13:09:23 +0200
committerMichal Klocek <michal.klocek@qt.io>2023-05-24 12:17:21 +0200
commite16c1f6366e550ce35e0ddf2fae7b818c3d884ca (patch)
tree78e7d26182dcbfb979c57d48ed3075c7a487ed46
parent9cc2a24e4d716816b696816b4056cd55290578df (diff)
Do not compile examples or tests with 6.2
We keep changes which fixes examples and tests in 6.2-lts branch. As examples and tests use some more modern features it would not look right to downgrade or clutter those with some workarounds in 6.5 branch. Change-Id: I49dd9840115e5fe3d5110f801d2514b9976ff822 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--examples/CMakeLists.txt2
-rw-r--r--tests/CMakeLists.txt4
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2d3ccab7e..f3b098d0b 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.16)
qt_examples_build_begin(EXTERNAL_BUILD)
-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+if(NOT CMAKE_CROSSCOMPILING AND Qt6Core_VERSION VERSION_GREATER_EQUAL "6.5") #QTBUG-86533
if(TARGET Qt::WebEngineCore)
add_subdirectory(webenginequick)
endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a8f031a5d..9e02c40ca 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1 +1,3 @@
-qt_build_tests()
+if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.5")
+ qt_build_tests()
+endif()