feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix skip auto moc

Browse Source 
Actually the syntax was wrong.

You can use

SKIP_AUTOMOC foo.cpp

or

PROPERTIES SKIP_AUTOMOC ON

SKIP_AUTOGEN is skipping AUTOUIC and AUTORCC too.

Change-Id: Id4afdc2572fc287ae66368ba0fd70b3ce7fc04ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
This commit is contained in:
Marco Bubke
2023-07-11 15:14:26 +02:00
parent 98cff9e097
commit e7a7914aa8
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -82,7 +82,6 @@ if(TARGET QmlDesignerCore)
add_feature_info("ProjectStorage" ${USE_PROJECTSTORAGE} "") add_feature_info("ProjectStorage" ${USE_PROJECTSTORAGE} "")
endif() endif()
extend_qtc_library(QmlDesignerCore extend_qtc_library(QmlDesignerCore
CONDITION ENABLE_COMPILE_WARNING_AS_ERROR CONDITION ENABLE_COMPILE_WARNING_AS_ERROR
PROPERTIES COMPILE_WARNING_AS_ERROR ON PROPERTIES COMPILE_WARNING_AS_ERROR ON
@@ -204,7 +203,7 @@ extend_qtc_library(QmlDesignerCore
) )
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_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore/include
SOURCES SOURCES
abstractproperty.h abstractproperty.h
@@ -389,7 +388,7 @@ extend_qtc_library(QmlDesignerCore
extend_qtc_library(QmlDesignerCore extend_qtc_library(QmlDesignerCore
SOURCES_PREFIX designercore/projectstorage SOURCES_PREFIX designercore/projectstorage
PUBLIC_INCLUDES designercore/projectstorage PUBLIC_INCLUDES designercore/projectstorage
SOURCES_PROPERTIES SKIP_AUTOMOC ON SOURCES_PROPERTIES SKIP_AUTOGEN ON
SOURCES SOURCES
commontypecache.h commontypecache.h
directorypathcompressor.h directorypathcompressor.h

2
tests/unit/tests/matchers/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_library(TestMatchers OBJECT add_qtc_library(TestMatchers OBJECT
EXCLUDE_FROM_INSTALL EXCLUDE_FROM_INSTALL
SKIP_AUTOMOC ON PROPERTIES SKIP_AUTOGEN ON
PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR} PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}
DEPENDS DEPENDS
Googletest Utils QmlDesigner Googletest Utils QmlDesigner

2
tests/unit/tests/mocks/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_library(TestMocks OBJECT add_qtc_library(TestMocks OBJECT
EXCLUDE_FROM_INSTALL EXCLUDE_FROM_INSTALL
SKIP_AUTOMOC ON PROPERTIES SKIP_AUTOGEN ON
PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR} PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}
DEPENDS DEPENDS
Qt::Core Qt::Widgets Googletest Sqlite TestDesignerCore Qt::Core Qt::Widgets Googletest Sqlite TestDesignerCore

2
tests/unit/tests/printers/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_library(TestPrinters OBJECT add_qtc_library(TestPrinters OBJECT
EXCLUDE_FROM_INSTALL EXCLUDE_FROM_INSTALL
SKIP_AUTOMOC ON PROPERTIES SKIP_AUTOGEN ON
PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR} PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}
DEPENDS DEPENDS
Qt::Core Qt::Widgets Sqlite Googletest TestDesignerCore Qt::Core Qt::Widgets Sqlite Googletest TestDesignerCore

2
tests/unit/tests/testdesignercore/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
add_qtc_library(TestDesignerCore OBJECT add_qtc_library(TestDesignerCore OBJECT
EXCLUDE_FROM_INSTALL EXCLUDE_FROM_INSTALL
PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR} PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}
SKIP_AUTOMOC ON PROPERTIES SKIP_AUTOGEN ON
DEPENDS DEPENDS
Qt::Core Qt::Network Qt::Widgets Qt::Core Qt::Network Qt::Widgets
Qt::Xml Qt::Concurrent Qt::QmlPrivate Qt::Gui Qt::Xml Qt::Concurrent Qt::QmlPrivate Qt::Gui

2
tests/unit/tests/unittests/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ file(RELATIVE_PATH TEST_RELATIVE_LIBEXEC_PATH "/${RELATIVE_TEST_PATH}" "/${IDE_L
add_qtc_test(unittest GTEST add_qtc_test(unittest GTEST
PROPERTIES COMPILE_WARNING_AS_ERROR OFF PROPERTIES COMPILE_WARNING_AS_ERROR OFF
SKIP_AUTOGEN ON PROPERTIES SKIP_AUTOGEN ON
DEPENDS DEPENDS
Qt::Core Qt::Network Qt::Widgets Qt::Core Qt::Network Qt::Widgets
Qt::Xml Qt::Concurrent Qt::QmlPrivate Qt::Gui Qt::Xml Qt::Concurrent Qt::QmlPrivate Qt::Gui