diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt index d760844a8c..e0e069d322 100644 --- a/src/concurrent/CMakeLists.txt +++ b/src/concurrent/CMakeLists.txt @@ -1,3 +1,9 @@ +# Generated from concurrent.pro. + +##################################################################### +## Concurrent Module: +##################################################################### + add_qt_module(Concurrent SOURCES qtconcurrent_global.h @@ -18,8 +24,21 @@ add_qt_module(Concurrent DEFINES QT_NO_USING_NAMESPACE QT_NO_FOREACH - LIBRARIES Qt::CorePrivate - PUBLIC_LIBRARIES Qt::Core + LIBRARIES + Qt::CorePrivate + PUBLIC_LIBRARIES # special case + Qt::Core + # CONFIG = "exceptions" + # PRECOMPILED_HEADER = "../corelib/global/qt_pch.h" + # _LOADED = "qt_module" +) + +## Scopes: +##################################################################### + +extend_target(Concurrent CONDITION MSVC AND (TEST_architecture STREQUAL "i386") + LINK_OPTIONS + "/BASE:0x66000000" ) add_qt_docs(./doc/qtconcurrent.qdocconf) diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index ac4dd8f023..8581f80d01 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -24,6 +24,20 @@ add_qt_module(Sql QT_NO_FOREACH LIBRARIES Qt::CorePrivate + PUBLIC_LIBRARIES # special case + Qt::Core + # MODULE_PLUGIN_TYPES = "sqldrivers" + # PRECOMPILED_HEADER = "../corelib/global/qt_pch.h" + # SQL_P = "sql" + # _LOADED = "qt_module" +) + +## Scopes: +##################################################################### + +extend_target(Sql CONDITION MSVC AND (TEST_architecture STREQUAL "i386") + LINK_OPTIONS + "/BASE:0x62000000" ) extend_target(Sql CONDITION QT_FEATURE_sqlmodel