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

CMake Build: rename target qmljs to QmlJS

Browse Source 
This is in sync with what qmake and qbs project have.

Change-Id: Id82bbd933a8331c3e2032e5068323c183b2a1814
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2020-01-16 12:38:22 +01:00
parent 892fc0f28b
commit 08202b9110
24 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmleditorwidgets/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_library(QmlEditorWidgets add_qtc_library(QmlEditorWidgets
DEPENDS qmljs Utils Qt5::Widgets DEPENDS QmlJS Utils Qt5::Widgets
SOURCES SOURCES
colorbox.cpp colorbox.h colorbox.cpp colorbox.h
colorbutton.cpp colorbutton.h colorbutton.cpp colorbutton.h

2
src/libs/qmljs/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_library(qmljs add_qtc_library(QmlJS
DEPENDS ExtensionSystem Utils DEPENDS ExtensionSystem Utils
PUBLIC_DEPENDS CPlusPlus Qt5::Widgets Qt5::Xml LanguageUtils PUBLIC_DEPENDS CPlusPlus Qt5::Widgets Qt5::Xml LanguageUtils
SOURCES SOURCES

2
src/plugins/cmakeprojectmanager/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(CMakeProjectManager add_qtc_plugin(CMakeProjectManager
DEPENDS qmljs DEPENDS QmlJS
PLUGIN_DEPENDS Core CppTools ProjectExplorer TextEditor QtSupport PLUGIN_DEPENDS Core CppTools ProjectExplorer TextEditor QtSupport
PLUGIN_RECOMMENDS Designer PLUGIN_RECOMMENDS Designer
SOURCES SOURCES

2
src/plugins/debugger/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Debugger add_qtc_plugin(Debugger
DEPENDS LanguageUtils QmlDebug qmljs QtcSsh registryaccess DEPENDS LanguageUtils QmlDebug QmlJS QtcSsh registryaccess
PLUGIN_DEPENDS Core CppTools ProjectExplorer QtSupport TextEditor PLUGIN_DEPENDS Core CppTools ProjectExplorer QtSupport TextEditor
PLUGIN_RECOMMENDS QmakeProjectManager PLUGIN_RECOMMENDS QmakeProjectManager
SOURCES SOURCES

2
src/plugins/qbsprojectmanager/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(QbsProjectManager add_qtc_plugin(QbsProjectManager
DEPENDS Qt5::Qml Qt5::Widgets qmljs DEPENDS Qt5::Qml Qt5::Widgets QmlJS
DEFINES DEFINES
IDE_LIBRARY_BASENAME="${IDE_LIBRARY_BASE_PATH}" IDE_LIBRARY_BASENAME="${IDE_LIBRARY_BASE_PATH}"
PLUGIN_DEPENDS Core ProjectExplorer CppTools QtSupport QmlJSTools PLUGIN_DEPENDS Core ProjectExplorer CppTools QtSupport QmlJSTools

2
src/plugins/qmakeprojectmanager/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(QmakeProjectManager add_qtc_plugin(QmakeProjectManager
DEPENDS qmljs DEPENDS QmlJS
PLUGIN_DEPENDS Core CppTools QtSupport ResourceEditor TextEditor PLUGIN_DEPENDS Core CppTools QtSupport ResourceEditor TextEditor
PLUGIN_RECOMMENDS Designer PLUGIN_RECOMMENDS Designer
SOURCES SOURCES

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

@@ -1,6 +1,6 @@
add_qtc_plugin(QmlDesigner add_qtc_plugin(QmlDesigner
DEPENDS DEPENDS
qmljs LanguageUtils QmlEditorWidgets QmlJS LanguageUtils QmlEditorWidgets
Qt5::QuickWidgets Qt5::CorePrivate Qt5::QuickWidgets Qt5::CorePrivate
DEFINES DEFINES
DESIGNER_CORE_LIBRARY DESIGNER_CORE_LIBRARY

2
src/plugins/qmljseditor/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(QmlJSEditor add_qtc_plugin(QmlJSEditor
DEPENDS LanguageUtils qmljs QmlEditorWidgets DEPENDS LanguageUtils QmlJS QmlEditorWidgets
PLUGIN_DEPENDS Core ProjectExplorer QmlJSTools TextEditor PLUGIN_DEPENDS Core ProjectExplorer QmlJSTools TextEditor
SOURCES SOURCES
qmlexpressionundercursor.cpp qmlexpressionundercursor.h qmlexpressionundercursor.cpp qmlexpressionundercursor.h

2
src/plugins/qmljstools/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_plugin(QmlJSTools add_qtc_plugin(QmlJSTools
DEPENDS LanguageUtils DEPENDS LanguageUtils
PUBLIC_DEPENDS qmljs PUBLIC_DEPENDS QmlJS
PLUGIN_DEPENDS Core CppTools ProjectExplorer QtSupport TextEditor PLUGIN_DEPENDS Core CppTools ProjectExplorer QtSupport TextEditor
SOURCES SOURCES
qmljsbundleprovider.cpp qmljsbundleprovider.h qmljsbundleprovider.cpp qmljsbundleprovider.h

2
src/plugins/qmlpreview/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(QmlPreview add_qtc_plugin(QmlPreview
DEPENDS QmlDebug qmljs DEPENDS QmlDebug QmlJS
PLUGIN_DEPENDS Core ProjectExplorer QmlJSTools QtSupport ResourceEditor QmlProjectManager PLUGIN_DEPENDS Core ProjectExplorer QmlJSTools QtSupport ResourceEditor QmlProjectManager
SOURCES SOURCES
qmlpreviewclient.cpp qmlpreviewclient.h qmlpreviewclient.cpp qmlpreviewclient.h

2
src/plugins/qmlprofiler/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(QmlProfiler add_qtc_plugin(QmlProfiler
DEPENDS QmlDebug qmljs Tracing Qt5::QuickWidgets DEPENDS QmlDebug QmlJS Tracing Qt5::QuickWidgets
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor
SOURCES SOURCES
debugmessagesmodel.cpp debugmessagesmodel.h debugmessagesmodel.cpp debugmessagesmodel.h

2
src/plugins/qmlprojectmanager/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(QmlProjectManager add_qtc_plugin(QmlProjectManager
DEPENDS qmljs DEPENDS QmlJS
PLUGIN_DEPENDS Core ProjectExplorer QtSupport PLUGIN_DEPENDS Core ProjectExplorer QtSupport
SOURCES SOURCES
fileformat/filefilteritems.cpp fileformat/filefilteritems.h fileformat/filefilteritems.cpp fileformat/filefilteritems.h

2
src/plugins/todo/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Todo add_qtc_plugin(Todo
DEPENDS qmljs DEPENDS QmlJS
PLUGIN_DEPENDS Core CppTools ProjectExplorer PLUGIN_DEPENDS Core CppTools ProjectExplorer
SOURCES SOURCES
constants.h constants.h

2
tests/auto/qml/codemodel/check/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_qml_check add_qtc_test(tst_qml_check
DEPENDS qmljs DEPENDS QmlJS
DEFINES DEFINES
QT_CREATOR QT_CREATOR
QTCREATORDIR="${PROJECT_SOURCE_DIR}" QTCREATORDIR="${PROJECT_SOURCE_DIR}"

2
tests/auto/qml/codemodel/dependencies/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_qml_dependencies add_qtc_test(tst_qml_dependencies
DEPENDS qmljs QmlJSTools ExtensionSystem Utils DEPENDS QmlJS QmlJSTools ExtensionSystem Utils
INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins" INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins"
DEFINES DEFINES
QT_CREATOR QT_CREATOR

2
tests/auto/qml/codemodel/ecmascript7/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_qml_ecmascript7 add_qtc_test(tst_qml_ecmascript7
DEPENDS qmljs QmlJSTools ExtensionSystem Utils DEPENDS QmlJS QmlJSTools ExtensionSystem Utils
INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins" INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins"
DEFINES DEFINES
QT_CREATOR QT_CREATOR

2
tests/auto/qml/codemodel/importscheck/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_qml_importscheck add_qtc_test(tst_qml_importscheck
DEPENDS qmljs QmlJSTools Utils CPlusPlus DEPENDS QmlJS QmlJSTools Utils CPlusPlus
INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins" INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins"
DEFINES DEFINES
QT_CREATOR QT_CREATOR

2
tests/auto/qml/persistenttrie/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_qml_testtrie add_qtc_test(tst_qml_testtrie
DEPENDS qmljs DEPENDS QmlJS
DEFINES DEFINES
QT_CREATOR QT_CREATOR
QTCREATORDIR="${PROJECT_SOURCE_DIR}" QTCREATORDIR="${PROJECT_SOURCE_DIR}"

2
tests/auto/qml/qmldesigner/coretests/CMakeLists.txt
View File

@@ -2,7 +2,7 @@
return() return()
add_qtc_test(tst_qml_testcore add_qtc_test(tst_qml_testcore
DEPENDS qmljs Utils QmlEditorWidgets CPlusPlus Core QmlJSEditor DEPENDS QmlJS Utils QmlEditorWidgets CPlusPlus Core QmlJSEditor
INCLUDES INCLUDES
"${PROJECT_SOURCE_DIR}/src/plugins/qmldesigner/designercore/include" "${PROJECT_SOURCE_DIR}/src/plugins/qmldesigner/designercore/include"
"${PROJECT_SOURCE_DIR}/src/plugins/qmldesigner/designercore" "${PROJECT_SOURCE_DIR}/src/plugins/qmldesigner/designercore"

2
tests/auto/qml/qmleditor/qmlcodeformatter/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_qml_qmlcodeformatter add_qtc_test(tst_qml_qmlcodeformatter
DEPENDS qmljs QmlJSTools TextEditor DEPENDS QmlJS QmlJSTools TextEditor
DEFINES DEFINES
QT_CREATOR QT_CREATOR
QTCREATORDIR="${PROJECT_SOURCE_DIR}" QTCREATORDIR="${PROJECT_SOURCE_DIR}"

2
tests/auto/qml/qmljssimplereader/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_qml_qmljssimplereader add_qtc_test(tst_qml_qmljssimplereader
DEPENDS qmljs DEPENDS QmlJS
DEFINES DEFINES
QT_CREATOR QT_CREATOR
QTCREATORDIR="${PROJECT_SOURCE_DIR}" QTCREATORDIR="${PROJECT_SOURCE_DIR}"

2
tests/auto/qml/qmlprojectmanager/fileformat/CMakeLists.txt
View File

@@ -10,7 +10,7 @@ foreach(source IN LISTS QmlProjectManagerSources)
endforeach() endforeach()
add_qtc_test(tst_qml_fileformat add_qtc_test(tst_qml_fileformat
DEPENDS qmljs Utils DEPENDS QmlJS Utils
INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins/qmlprojectmanager/fileformat" INCLUDES "${PROJECT_SOURCE_DIR}/src/plugins/qmlprojectmanager/fileformat"
DEFINES DEFINES
QT_CREATOR QT_CREATOR

2
tests/auto/qml/qrcparser/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_qml_qrcparser add_qtc_test(tst_qml_qrcparser
DEPENDS qmljs Utils DEPENDS QmlJS Utils
DEFINES DEFINES
QT_CREATOR QT_CREATOR
QTCREATORDIR="${PROJECT_SOURCE_DIR}" QTCREATORDIR="${PROJECT_SOURCE_DIR}"

2
tests/auto/qml/reformatter/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_qml_reformatter add_qtc_test(tst_qml_reformatter
DEPENDS qmljs DEPENDS QmlJS
DEFINES DEFINES
QT_CREATOR QT_CREATOR
QTCREATORDIR="${PROJECT_SOURCE_DIR}" QTCREATORDIR="${PROJECT_SOURCE_DIR}"