summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2021-06-14 13:31:48 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2021-06-16 13:24:21 +0300
commit937877d9f73e37655228b0b01ffcc60761bd0c2f (patch)
treea707da5944dfd128a0ca0b04ee0fd0a270e5ec81
parent72bd22db9f72c4d93774c79cae0760bdc39ce0de (diff)
CMake: adapt to new CMake API
Update dependencies and adapt to the new Qt CMake API. Change-Id: Ib8b52f00da8f2be5f0f8706f091487a109e34848 Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
-rw-r--r--coin/dependencies.yaml2
-rw-r--r--coin/product_dependencies.yaml2
-rw-r--r--libqdb/CMakeLists.txt6
3 files changed, 5 insertions, 5 deletions
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml
index 791bbc8..1547a5f 100644
--- a/coin/dependencies.yaml
+++ b/coin/dependencies.yaml
@@ -1,4 +1,4 @@
dependencies:
../../qt/qtbase:
- ref: 516316e9a24fc3a290ce220a9a6cda0af541ca4c
+ ref: 4151d5869a60c0e130b32e1ae35c8e81477ecc86
required: true
diff --git a/coin/product_dependencies.yaml b/coin/product_dependencies.yaml
index f2ad3b9..03cb2be 100644
--- a/coin/product_dependencies.yaml
+++ b/coin/product_dependencies.yaml
@@ -1,3 +1,3 @@
dependencies:
../../qt/qt5.git:
- ref: "6.1"
+ ref: "6.2"
diff --git a/libqdb/CMakeLists.txt b/libqdb/CMakeLists.txt
index 7454a2c..00759d8 100644
--- a/libqdb/CMakeLists.txt
+++ b/libqdb/CMakeLists.txt
@@ -16,17 +16,17 @@ qt_internal_add_cmake_library(libqdb
Qt::Core
)
-qt_extend_target(libqdb CONDITION WIN32
+qt_internal_extend_target(libqdb CONDITION WIN32
SOURCES
interruptsignalhandler_win.cpp
)
-qt_extend_target(libqdb CONDITION WIN64
+qt_internal_extend_target(libqdb CONDITION WIN64
SOURCES
interruptsignalhandler_win.cpp
)
-qt_extend_target(libqdb CONDITION UNIX
+qt_internal_extend_target(libqdb CONDITION UNIX
SOURCES
interruptsignalhandler_unix.cpp
)