aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2020-01-16 12:38:22 +0100
committerCristian Adam <cristian.adam@qt.io>2020-01-16 17:32:24 +0000
commit08202b91106d52cc95272f2628de51a794229b18 (patch)
treef705c0aa18e26ec17afb15a45f6f953fad9aeed4
parent892fc0f28bc6f4ff34f82c6c8cde7403b06cee6a (diff)
CMake Build: rename target qmljs to QmlJS
This is in sync with what qmake and qbs project have. Change-Id: Id82bbd933a8331c3e2032e5068323c183b2a1814 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r--src/libs/qmleditorwidgets/CMakeLists.txt2
-rw-r--r--src/libs/qmljs/CMakeLists.txt2
-rw-r--r--src/plugins/cmakeprojectmanager/CMakeLists.txt2
-rw-r--r--src/plugins/debugger/CMakeLists.txt2
-rw-r--r--src/plugins/qbsprojectmanager/CMakeLists.txt2
-rw-r--r--src/plugins/qmakeprojectmanager/CMakeLists.txt2
-rw-r--r--src/plugins/qmldesigner/CMakeLists.txt2
-rw-r--r--src/plugins/qmljseditor/CMakeLists.txt2
-rw-r--r--src/plugins/qmljstools/CMakeLists.txt2
-rw-r--r--src/plugins/qmlpreview/CMakeLists.txt2
-rw-r--r--src/plugins/qmlprofiler/CMakeLists.txt2
-rw-r--r--src/plugins/qmlprojectmanager/CMakeLists.txt2
-rw-r--r--src/plugins/todo/CMakeLists.txt2
-rw-r--r--tests/auto/qml/codemodel/check/CMakeLists.txt2
-rw-r--r--tests/auto/qml/codemodel/dependencies/CMakeLists.txt2
-rw-r--r--tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt2
-rw-r--r--tests/auto/qml/codemodel/importscheck/CMakeLists.txt2
-rw-r--r--tests/auto/qml/persistenttrie/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmldesigner/coretests/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmljssimplereader/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt2
-rw-r--r--tests/auto/qml/qrcparser/CMakeLists.txt2
-rw-r--r--tests/auto/qml/reformatter/CMakeLists.txt2
24 files changed, 24 insertions, 24 deletions
diff --git a/src/libs/qmleditorwidgets/CMakeLists.txt b/src/libs/qmleditorwidgets/CMakeLists.txt
index b235601754..b33a7bd075 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 9576fe860b..5ccb629cb2 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 651b557e86..0b2955646f 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 7c2ca7d6d7..ef89bcdb72 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 98f69859aa..a754c922d7 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 9e3e58c653..bfebb9199e 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 29edff4d2d..4eb99638c7 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 c931d1729d..de5ce58f0f 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 bdfcb519ff..e626adcaed 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 cf65ef4ded..4fe2f8e5ea 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 63df2d6a01..9b465f3e45 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 c512e2b0b7..1d8527c221 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 6283407272..893e43a550 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 c5d45604d2..62dfe64e8a 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 c602d7b60a..43e915176a 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 c6ec132307..d5d20cc300 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 6da32f5703..a7c10f9d5e 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 3053ea8487..5859de97c2 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 87842321db..83f9da98a0 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 75506b8b27..4ed1212336 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 e4f7ce9051..878ef3c132 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 98d3b38986..91800cd75e 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 3bb82971d5..a4600184c5 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 de63ba3e0c..2a3ba7f1e8 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}"