From a3f990d713784927e0e6db8fbb7ce47340b39e0d Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 8 Jun 2023 15:25:44 +0200 Subject: QmlDesigner: Add type lookup Task-number: QDS-10246 Change-Id: I607f72e29734a3c59b7b5b33d96735d708cd18ec Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/qmldesigner/CMakeLists.txt') diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index cd0b2a399b7..2d6bffce5bc 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -407,7 +407,7 @@ extend_qtc_library(QmlDesignerCore projectstorage.cpp projectstorage.h sourcepath.h sourcepathcache.h - sourcepathcache.h + sourcepathcacheinterface.h sourcepathcachetypes.h sourcepathview.h storagecache.h -- cgit v1.2.3 From e1171359ab9de6c92719460d96c8125fd1235141 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 6 Jul 2023 10:27:20 +0200 Subject: QmlDesigner: Disable auto moc for non-qobjects Change-Id: Ibca60ac262a4d43f8963b23ab6c2de5fa0098b27 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/CMakeLists.txt | 37 ++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'src/plugins/qmldesigner/CMakeLists.txt') diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 2d6bffce5bc..070aa7943f2 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -186,23 +186,40 @@ extend_qtc_library(QmlDesignerCore extend_qtc_library(QmlDesignerCore SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore/include SOURCES - abstractproperty.h abstractview.h + basetexteditmodifier.h + bytearraymodifier.h + componenttextmodifier.h + forwardview.h + itemlibraryinfo.h + metainforeader.h + model.h + nodehints.h + plaintexteditmodifier.h + nodeinstanceview.h + propertyparser.h + rewriterview.h + subcomponentmanager.h + textmodifier.h +) + +extend_qtc_library(QmlDesignerCore + SOURCES_PROPERTIES SKIP_AUTOMOC ON + SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/designercore/include + SOURCES + abstractproperty.h anchorline.h annotation.h asynchronousexplicitimagecache.h asynchronousimagecache.h auxiliarydata.h auxiliarydataproperties.h - basetexteditmodifier.h bindingproperty.h - componenttextmodifier.h customnotifications.h documentmessage.h enumerationmetainfo.h exception.h externaldependenciesinterface.h - forwardview.h imagecacheauxiliarydata.h import.h invalidargumentexception.h @@ -214,33 +231,26 @@ extend_qtc_library(QmlDesignerCore invalidqmlsourceexception.h invalidreparentingexception.h invalidslideindexexception.h - itemlibraryinfo.h mathutils.h metainfo.h - metainforeader.h - model.h modelfwd.h modelmerger.h modelnode.h modelnodepositionstorage.h nodeabstractproperty.h - nodehints.h nodeinstance.h - nodeinstanceview.h nodelistproperty.h nodemetainfo.h nodeproperty.h notimplementedexception.h - plaintexteditmodifier.h propertycontainer.h propertymetainfo.h propertynode.h - propertyparser.h qmlanchors.h qmlchangeset.h qmlconnections.h - qmldesignercorelib_global.h qmldesignercorelib_exports.h + qmldesignercorelib_global.h qmlitemnode.h qmlmodelnodefacade.h qmlobjectnode.h @@ -248,14 +258,11 @@ extend_qtc_library(QmlDesignerCore qmltimeline.h qmltimelinekeyframegroup.h removebasestateexception.h - rewriterview.h rewritingexception.h signalhandlerproperty.h stringutils.h stylesheetmerger.h - subcomponentmanager.h synchronousimagecache.h - textmodifier.h variantproperty.h ) -- cgit v1.2.3 From e7a7914aa85f99ac5c129a7e667184bfce666aa0 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 11 Jul 2023 15:14:26 +0200 Subject: QmlDesigner: Fix skip auto moc 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 Reviewed-by: Burak Hancerli --- src/plugins/qmldesigner/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/plugins/qmldesigner/CMakeLists.txt') 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 -- cgit v1.2.3