diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 070aa7943f2..143da043e25 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -82,7 +82,6 @@ if(TARGET QmlDesignerCore) add_feature_info("ProjectStorage" ${USE_PROJECTSTORAGE} "") endif() - extend_qtc_library(QmlDesignerCore CONDITION ENABLE_COMPILE_WARNING_AS_ERROR PROPERTIES COMPILE_WARNING_AS_ERROR ON @@ -204,7 +203,7 @@ extend_qtc_library(QmlDesignerCore ) extend_qtc_library(QmlDesignerCore - SOURCES_PROPERTIES SKIP_AUTOMOC ON + SOURCES_PROPERTIES SKIP_AUTOGEN ON SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore/include SOURCES abstractproperty.h @@ -389,7 +388,7 @@ extend_qtc_library(QmlDesignerCore extend_qtc_library(QmlDesignerCore SOURCES_PREFIX designercore/projectstorage PUBLIC_INCLUDES designercore/projectstorage - SOURCES_PROPERTIES SKIP_AUTOMOC ON + SOURCES_PROPERTIES SKIP_AUTOGEN ON SOURCES commontypecache.h directorypathcompressor.h diff --git a/tests/unit/tests/matchers/CMakeLists.txt b/tests/unit/tests/matchers/CMakeLists.txt index ee7b0f786c1..2c740669d48 100644 --- a/tests/unit/tests/matchers/CMakeLists.txt +++ b/tests/unit/tests/matchers/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_library(TestMatchers OBJECT EXCLUDE_FROM_INSTALL - SKIP_AUTOMOC ON + PROPERTIES SKIP_AUTOGEN ON PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR} DEPENDS Googletest Utils QmlDesigner diff --git a/tests/unit/tests/mocks/CMakeLists.txt b/tests/unit/tests/mocks/CMakeLists.txt index 99a7911a65e..91a45acab0c 100644 --- a/tests/unit/tests/mocks/CMakeLists.txt +++ b/tests/unit/tests/mocks/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_library(TestMocks OBJECT EXCLUDE_FROM_INSTALL - SKIP_AUTOMOC ON + PROPERTIES SKIP_AUTOGEN ON PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR} DEPENDS Qt::Core Qt::Widgets Googletest Sqlite TestDesignerCore diff --git a/tests/unit/tests/printers/CMakeLists.txt b/tests/unit/tests/printers/CMakeLists.txt index 83f6812ef03..2f7ec4c3bba 100644 --- a/tests/unit/tests/printers/CMakeLists.txt +++ b/tests/unit/tests/printers/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_library(TestPrinters OBJECT EXCLUDE_FROM_INSTALL - SKIP_AUTOMOC ON + PROPERTIES SKIP_AUTOGEN ON PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR} DEPENDS Qt::Core Qt::Widgets Sqlite Googletest TestDesignerCore diff --git a/tests/unit/tests/testdesignercore/CMakeLists.txt b/tests/unit/tests/testdesignercore/CMakeLists.txt index 5f3a4e26af7..be7f5376abe 100644 --- a/tests/unit/tests/testdesignercore/CMakeLists.txt +++ b/tests/unit/tests/testdesignercore/CMakeLists.txt @@ -1,7 +1,7 @@ add_qtc_library(TestDesignerCore OBJECT EXCLUDE_FROM_INSTALL PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR} - SKIP_AUTOMOC ON + PROPERTIES SKIP_AUTOGEN ON DEPENDS Qt::Core Qt::Network Qt::Widgets Qt::Xml Qt::Concurrent Qt::QmlPrivate Qt::Gui diff --git a/tests/unit/tests/unittests/CMakeLists.txt b/tests/unit/tests/unittests/CMakeLists.txt index 04ed0d571c2..97e1fb9c90b 100644 --- a/tests/unit/tests/unittests/CMakeLists.txt +++ b/tests/unit/tests/unittests/CMakeLists.txt @@ -3,7 +3,7 @@ file(RELATIVE_PATH TEST_RELATIVE_LIBEXEC_PATH "/${RELATIVE_TEST_PATH}" "/${IDE_L add_qtc_test(unittest GTEST PROPERTIES COMPILE_WARNING_AS_ERROR OFF - SKIP_AUTOGEN ON + PROPERTIES SKIP_AUTOGEN ON DEPENDS Qt::Core Qt::Network Qt::Widgets Qt::Xml Qt::Concurrent Qt::QmlPrivate Qt::Gui