From a45d3e12a4208b919b669fa2f386ddfbcfac0f7f Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 20 Apr 2020 12:24:02 +0200 Subject: [PATCH] CMake build: Add public include for QmlDesigner plugins QmlDesigner plugins need this include path, no need to repeat that over and over again. It also makes it easier to support out-of-repository plugins. Task-number: QTCREATORBUG-23778 Change-Id: I33e959fe56815e59a5e8e0db0bbdff016411b067 Reviewed-by: Cristian Adam --- src/plugins/qmldesigner/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 85e0c67ec9e..42feb7c13f7 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -5,7 +5,7 @@ add_qtc_plugin(QmlDesigner DEFINES DESIGNER_CORE_LIBRARY IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\" - INCLUDES + PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/designercore/include PLUGIN_DEPENDS Core ProjectExplorer QmlJSEditor QmakeProjectManager QmlProjectManager @@ -41,7 +41,6 @@ add_qtc_plugin(componentsplugin CONDITION TARGET QmlDesigner DEPENDS Core QmlDesigner Utils Qt5::Qml DEFINES COMPONENTS_LIBRARY - INCLUDES ${CMAKE_CURRENT_LIST_DIR}/designercore/include SOURCES componentsplugin/addtabdesigneraction.cpp componentsplugin/addtabdesigneraction.h componentsplugin/addtabtotabviewdialog.cpp componentsplugin/addtabtotabviewdialog.h @@ -57,7 +56,6 @@ add_qtc_plugin(componentsplugin add_qtc_plugin(qmlpreviewplugin CONDITION TARGET QmlDesigner DEPENDS Core ProjectExplorer QmlDesigner Utils Qt5::Qml - INCLUDES ${CMAKE_CURRENT_LIST_DIR}/designercore/include SOURCES qmlpreviewplugin/qmlpreviewactions.cpp qmlpreviewplugin/qmlpreviewactions.h qmlpreviewplugin/qmlpreviewplugin.cpp qmlpreviewplugin/qmlpreviewplugin.h @@ -70,7 +68,6 @@ add_qtc_plugin(qtquickplugin CONDITION TARGET QmlDesigner DEPENDS Core QmlDesigner Utils Qt5::Qml DEFINES QTQUICK_LIBRARY - INCLUDES ${CMAKE_CURRENT_LIST_DIR}/designercore/include SOURCES qtquickplugin/qtquickplugin.cpp qtquickplugin/qtquickplugin.h qtquickplugin/qtquickplugin.qrc