diff --git a/src/libs/qmleditorwidgets/CMakeLists.txt b/src/libs/qmleditorwidgets/CMakeLists.txt index b2356017549..b33a7bd075b 100644 --- a/src/libs/qmleditorwidgets/CMakeLists.txt +++ b/src/libs/qmleditorwidgets/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_library(QmlEditorWidgets - DEPENDS qmljs Utils Qt5::Widgets + DEPENDS QmlJS Utils Qt5::Widgets SOURCES colorbox.cpp colorbox.h colorbutton.cpp colorbutton.h diff --git a/src/libs/qmljs/CMakeLists.txt b/src/libs/qmljs/CMakeLists.txt index 9576fe860b7..5ccb629cb23 100644 --- a/src/libs/qmljs/CMakeLists.txt +++ b/src/libs/qmljs/CMakeLists.txt @@ -1,4 +1,4 @@ -add_qtc_library(qmljs +add_qtc_library(QmlJS DEPENDS ExtensionSystem Utils PUBLIC_DEPENDS CPlusPlus Qt5::Widgets Qt5::Xml LanguageUtils SOURCES diff --git a/src/plugins/cmakeprojectmanager/CMakeLists.txt b/src/plugins/cmakeprojectmanager/CMakeLists.txt index 651b557e861..0b2955646f8 100644 --- a/src/plugins/cmakeprojectmanager/CMakeLists.txt +++ b/src/plugins/cmakeprojectmanager/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(CMakeProjectManager - DEPENDS qmljs + DEPENDS QmlJS PLUGIN_DEPENDS Core CppTools ProjectExplorer TextEditor QtSupport PLUGIN_RECOMMENDS Designer SOURCES diff --git a/src/plugins/debugger/CMakeLists.txt b/src/plugins/debugger/CMakeLists.txt index 7c2ca7d6d72..ef89bcdb72e 100644 --- a/src/plugins/debugger/CMakeLists.txt +++ b/src/plugins/debugger/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(Debugger - DEPENDS LanguageUtils QmlDebug qmljs QtcSsh registryaccess + DEPENDS LanguageUtils QmlDebug QmlJS QtcSsh registryaccess PLUGIN_DEPENDS Core CppTools ProjectExplorer QtSupport TextEditor PLUGIN_RECOMMENDS QmakeProjectManager SOURCES diff --git a/src/plugins/qbsprojectmanager/CMakeLists.txt b/src/plugins/qbsprojectmanager/CMakeLists.txt index 98f69859aa0..a754c922d7d 100644 --- a/src/plugins/qbsprojectmanager/CMakeLists.txt +++ b/src/plugins/qbsprojectmanager/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(QbsProjectManager - DEPENDS Qt5::Qml Qt5::Widgets qmljs + DEPENDS Qt5::Qml Qt5::Widgets QmlJS DEFINES IDE_LIBRARY_BASENAME="${IDE_LIBRARY_BASE_PATH}" PLUGIN_DEPENDS Core ProjectExplorer CppTools QtSupport QmlJSTools diff --git a/src/plugins/qmakeprojectmanager/CMakeLists.txt b/src/plugins/qmakeprojectmanager/CMakeLists.txt index 9e3e58c653d..bfebb9199ec 100644 --- a/src/plugins/qmakeprojectmanager/CMakeLists.txt +++ b/src/plugins/qmakeprojectmanager/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(QmakeProjectManager - DEPENDS qmljs + DEPENDS QmlJS PLUGIN_DEPENDS Core CppTools QtSupport ResourceEditor TextEditor PLUGIN_RECOMMENDS Designer SOURCES diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 29edff4d2d8..4eb99638c74 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_plugin(QmlDesigner DEPENDS - qmljs LanguageUtils QmlEditorWidgets + QmlJS LanguageUtils QmlEditorWidgets Qt5::QuickWidgets Qt5::CorePrivate DEFINES DESIGNER_CORE_LIBRARY diff --git a/src/plugins/qmljseditor/CMakeLists.txt b/src/plugins/qmljseditor/CMakeLists.txt index c931d1729d7..de5ce58f0f0 100644 --- a/src/plugins/qmljseditor/CMakeLists.txt +++ b/src/plugins/qmljseditor/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(QmlJSEditor - DEPENDS LanguageUtils qmljs QmlEditorWidgets + DEPENDS LanguageUtils QmlJS QmlEditorWidgets PLUGIN_DEPENDS Core ProjectExplorer QmlJSTools TextEditor SOURCES qmlexpressionundercursor.cpp qmlexpressionundercursor.h diff --git a/src/plugins/qmljstools/CMakeLists.txt b/src/plugins/qmljstools/CMakeLists.txt index bdfcb519ffb..e626adcaede 100644 --- a/src/plugins/qmljstools/CMakeLists.txt +++ b/src/plugins/qmljstools/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_plugin(QmlJSTools DEPENDS LanguageUtils - PUBLIC_DEPENDS qmljs + PUBLIC_DEPENDS QmlJS PLUGIN_DEPENDS Core CppTools ProjectExplorer QtSupport TextEditor SOURCES qmljsbundleprovider.cpp qmljsbundleprovider.h diff --git a/src/plugins/qmlpreview/CMakeLists.txt b/src/plugins/qmlpreview/CMakeLists.txt index cf65ef4ded3..4fe2f8e5ea1 100644 --- a/src/plugins/qmlpreview/CMakeLists.txt +++ b/src/plugins/qmlpreview/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(QmlPreview - DEPENDS QmlDebug qmljs + DEPENDS QmlDebug QmlJS PLUGIN_DEPENDS Core ProjectExplorer QmlJSTools QtSupport ResourceEditor QmlProjectManager SOURCES qmlpreviewclient.cpp qmlpreviewclient.h diff --git a/src/plugins/qmlprofiler/CMakeLists.txt b/src/plugins/qmlprofiler/CMakeLists.txt index 63df2d6a011..9b465f3e45d 100644 --- a/src/plugins/qmlprofiler/CMakeLists.txt +++ b/src/plugins/qmlprofiler/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(QmlProfiler - DEPENDS QmlDebug qmljs Tracing Qt5::QuickWidgets + DEPENDS QmlDebug QmlJS Tracing Qt5::QuickWidgets PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor SOURCES debugmessagesmodel.cpp debugmessagesmodel.h diff --git a/src/plugins/qmlprojectmanager/CMakeLists.txt b/src/plugins/qmlprojectmanager/CMakeLists.txt index c512e2b0b70..1d8527c221a 100644 --- a/src/plugins/qmlprojectmanager/CMakeLists.txt +++ b/src/plugins/qmlprojectmanager/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(QmlProjectManager - DEPENDS qmljs + DEPENDS QmlJS PLUGIN_DEPENDS Core ProjectExplorer QtSupport SOURCES fileformat/filefilteritems.cpp fileformat/filefilteritems.h diff --git a/src/plugins/todo/CMakeLists.txt b/src/plugins/todo/CMakeLists.txt index 62834072728..893e43a550c 100644 --- a/src/plugins/todo/CMakeLists.txt +++ b/src/plugins/todo/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(Todo - DEPENDS qmljs + DEPENDS QmlJS PLUGIN_DEPENDS Core CppTools ProjectExplorer SOURCES constants.h diff --git a/tests/auto/qml/codemodel/check/CMakeLists.txt b/tests/auto/qml/codemodel/check/CMakeLists.txt index c5d45604d20..62dfe64e8a6 100644 --- a/tests/auto/qml/codemodel/check/CMakeLists.txt +++ b/tests/auto/qml/codemodel/check/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_qml_check - DEPENDS qmljs + DEPENDS QmlJS DEFINES QT_CREATOR QTCREATORDIR="${PROJECT_SOURCE_DIR}" diff --git a/tests/auto/qml/codemodel/dependencies/CMakeLists.txt b/tests/auto/qml/codemodel/dependencies/CMakeLists.txt index c602d7b60a5..43e915176a0 100644 --- a/tests/auto/qml/codemodel/dependencies/CMakeLists.txt +++ b/tests/auto/qml/codemodel/dependencies/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_qml_dependencies - DEPENDS qmljs QmlJSTools ExtensionSystem Utils + DEPENDS QmlJS QmlJSTools ExtensionSystem Utils INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins" DEFINES QT_CREATOR diff --git a/tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt b/tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt index c6ec1323073..d5d20cc3000 100644 --- a/tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt +++ b/tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_qml_ecmascript7 - DEPENDS qmljs QmlJSTools ExtensionSystem Utils + DEPENDS QmlJS QmlJSTools ExtensionSystem Utils INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins" DEFINES QT_CREATOR diff --git a/tests/auto/qml/codemodel/importscheck/CMakeLists.txt b/tests/auto/qml/codemodel/importscheck/CMakeLists.txt index 6da32f57035..a7c10f9d5e2 100644 --- a/tests/auto/qml/codemodel/importscheck/CMakeLists.txt +++ b/tests/auto/qml/codemodel/importscheck/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_qml_importscheck - DEPENDS qmljs QmlJSTools Utils CPlusPlus + DEPENDS QmlJS QmlJSTools Utils CPlusPlus INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins" DEFINES QT_CREATOR diff --git a/tests/auto/qml/persistenttrie/CMakeLists.txt b/tests/auto/qml/persistenttrie/CMakeLists.txt index 3053ea8487b..5859de97c2c 100644 --- a/tests/auto/qml/persistenttrie/CMakeLists.txt +++ b/tests/auto/qml/persistenttrie/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_qml_testtrie - DEPENDS qmljs + DEPENDS QmlJS DEFINES QT_CREATOR QTCREATORDIR="${PROJECT_SOURCE_DIR}" diff --git a/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt b/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt index 87842321db6..83f9da98a0a 100644 --- a/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt +++ b/tests/auto/qml/qmldesigner/coretests/CMakeLists.txt @@ -2,7 +2,7 @@ return() add_qtc_test(tst_qml_testcore - DEPENDS qmljs Utils QmlEditorWidgets CPlusPlus Core QmlJSEditor + DEPENDS QmlJS Utils QmlEditorWidgets CPlusPlus Core QmlJSEditor INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins/qmldesigner/designercore/include" "${PROJECT_SOURCE_DIR}/src/plugins/qmldesigner/designercore" diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt b/tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt index 75506b8b276..4ed12123363 100644 --- a/tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt +++ b/tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_qml_qmlcodeformatter - DEPENDS qmljs QmlJSTools TextEditor + DEPENDS QmlJS QmlJSTools TextEditor DEFINES QT_CREATOR QTCREATORDIR="${PROJECT_SOURCE_DIR}" diff --git a/tests/auto/qml/qmljssimplereader/CMakeLists.txt b/tests/auto/qml/qmljssimplereader/CMakeLists.txt index e4f7ce90515..878ef3c1328 100644 --- a/tests/auto/qml/qmljssimplereader/CMakeLists.txt +++ b/tests/auto/qml/qmljssimplereader/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_qml_qmljssimplereader - DEPENDS qmljs + DEPENDS QmlJS DEFINES QT_CREATOR QTCREATORDIR="${PROJECT_SOURCE_DIR}" diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt b/tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt index 98d3b389862..91800cd75ee 100644 --- a/tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt +++ b/tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt @@ -10,7 +10,7 @@ foreach(source IN LISTS QmlProjectManagerSources) endforeach() add_qtc_test(tst_qml_fileformat - DEPENDS qmljs Utils + DEPENDS QmlJS Utils INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins/qmlprojectmanager/fileformat" DEFINES QT_CREATOR diff --git a/tests/auto/qml/qrcparser/CMakeLists.txt b/tests/auto/qml/qrcparser/CMakeLists.txt index 3bb82971d5e..a4600184c52 100644 --- a/tests/auto/qml/qrcparser/CMakeLists.txt +++ b/tests/auto/qml/qrcparser/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_qml_qrcparser - DEPENDS qmljs Utils + DEPENDS QmlJS Utils DEFINES QT_CREATOR QTCREATORDIR="${PROJECT_SOURCE_DIR}" diff --git a/tests/auto/qml/reformatter/CMakeLists.txt b/tests/auto/qml/reformatter/CMakeLists.txt index de63ba3e0c4..2a3ba7f1e84 100644 --- a/tests/auto/qml/reformatter/CMakeLists.txt +++ b/tests/auto/qml/reformatter/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_test(tst_qml_reformatter - DEPENDS qmljs + DEPENDS QmlJS DEFINES QT_CREATOR QTCREATORDIR="${PROJECT_SOURCE_DIR}"