diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2023-08-23 20:11:19 +0300 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2023-08-24 12:10:52 +0300 |
| commit | 4f52ce337c0b534d8a89264380e9b6cff1956f97 (patch) | |
| tree | 08d9539ac68afc44c127d5e6fecda40f16f7d708 | |
| parent | 287fb2847d492a503bdb0f66520972b3445c7a82 (diff) | |
Mark the whole repo with QT_NO_CONTEXTLESS_CONNECT
By adding it to the default build flags via .cmake.conf.
This amends commit 69404b3f0d4e650c0b21ed07862be49b51c99300.
Task-number: QTBUG-116296
Change-Id: I8e80246dc2283b369f31971aaceeb907b0cfdfd0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | .cmake.conf | 1 | ||||
| -rw-r--r-- | src/datavisualization/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/datavisualizationqml/CMakeLists.txt | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf index 734bc2d5..64c98460 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -2,3 +2,4 @@ set(QT_REPO_MODULE_VERSION "6.7.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff --git a/src/datavisualization/CMakeLists.txt b/src/datavisualization/CMakeLists.txt index fb216466..27f82340 100644 --- a/src/datavisualization/CMakeLists.txt +++ b/src/datavisualization/CMakeLists.txt @@ -80,8 +80,6 @@ qt_internal_add_module(DataVisualization utils/texturehelper.cpp utils/texturehelper_p.h utils/utils.cpp utils/utils_p.h utils/vertexindexer.cpp utils/vertexindexer_p.h - DEFINES - QT_NO_CONTEXTLESS_CONNECT NO_PCH_SOURCES # undef QT_NO_FOREACH: engine/abstract3dcontroller.cpp diff --git a/src/datavisualizationqml/CMakeLists.txt b/src/datavisualizationqml/CMakeLists.txt index d0c0e21b..78275340 100644 --- a/src/datavisualizationqml/CMakeLists.txt +++ b/src/datavisualizationqml/CMakeLists.txt @@ -46,8 +46,6 @@ qt_internal_add_qml_module(DataVisualizationQml glstatestore.cpp glstatestore_p.h NO_PCH_SOURCES declarativetheme.cpp # undef QT_NO_FOREACH - DEFINES - QT_NO_CONTEXTLESS_CONNECT QML_FILES ${qml_files} RESOURCES |