diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-05 17:02:52 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-08 08:22:42 +0000 |
| commit | 5a3e668533450e82d0159596e5c24e738905f5f7 (patch) | |
| tree | 87e769d1cd0f6c6d9e83d309eebab46ad634ece8 /src/qmldevtools | |
| parent | f6f5687032bd6451e52c9ef221fb6a8a5b194389 (diff) | |
Port the declarative tools
Also fix up QmlDevTools module to not depend on QtQml,
but instead make it include the headers / cpp files as it is done
in the qmake project.
Change-Id: I240c52d5357db150a7c0c819892fb0a3708ceee4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qmldevtools')
| -rw-r--r-- | src/qmldevtools/.prev_CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/qmldevtools/CMakeLists.txt | 28 |
2 files changed, 28 insertions, 8 deletions
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt index c868dff329..24b87902ea 100644 --- a/src/qmldevtools/.prev_CMakeLists.txt +++ b/src/qmldevtools/.prev_CMakeLists.txt @@ -5,6 +5,8 @@ ##################################################################### add_qt_module(QmlDevTools + STATIC + INTERNAL_MODULE NO_SYNC_QT SOURCES ../qml/compiler/qqmlirbuilder.cpp ../qml/compiler/qqmlirbuilder_p.h @@ -35,9 +37,9 @@ add_qt_module(QmlDevTools ../qml/qmldirparser/qqmlerror.cpp ../qml/qmldirparser/qqmlerror.h ../qml/qmldirparser/qqmlsourcecoordinate_p.h INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BUILD_DIR}/../qml - ${CMAKE_CURRENT_BUILD_DIR}/../qml/compiler - ${CMAKE_CURRENT_BUILD_DIR}/../qml/qmldirparser + ${CMAKE_CURRENT_BINARY_DIR}/../qml + ${CMAKE_CURRENT_BINARY_DIR}/../qml/compiler + ${CMAKE_CURRENT_BINARY_DIR}/../qml/qmldirparser ../qml/compiler ../qml/qmldirparser LIBRARIES diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt index 5ac189074e..c8df1b7a75 100644 --- a/src/qmldevtools/CMakeLists.txt +++ b/src/qmldevtools/CMakeLists.txt @@ -5,6 +5,8 @@ ##################################################################### add_qt_module(QmlDevTools + STATIC + INTERNAL_MODULE NO_SYNC_QT SOURCES ../qml/compiler/qqmlirbuilder.cpp ../qml/compiler/qqmlirbuilder_p.h @@ -35,19 +37,35 @@ add_qt_module(QmlDevTools ../qml/qmldirparser/qqmlerror.cpp ../qml/qmldirparser/qqmlerror.h ../qml/qmldirparser/qqmlsourcecoordinate_p.h INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BUILD_DIR}/../qml - ${CMAKE_CURRENT_BUILD_DIR}/../qml/compiler - ${CMAKE_CURRENT_BUILD_DIR}/../qml/qmldirparser + ${CMAKE_CURRENT_BINARY_DIR}/../qml + ${CMAKE_CURRENT_BINARY_DIR}/../qml/compiler + ${CMAKE_CURRENT_BINARY_DIR}/../qml/qmldirparser ../qml/compiler ../qml/qmldirparser LIBRARIES Qt::CorePrivate - Qt::QmlPrivate # special case PUBLIC_LIBRARIES Qt::Core - Qt::Qml # special case ) +# special case begin +# Need to generate the parser files as in Qml module. +set(_qt_qlalr_flags "--no-debug" "--qt") +qt_process_qlalr("${CMAKE_CURRENT_SOURCE_DIR}/../qml/parser/qqmljs.g" QmlDevTools "${_qt_qlalr_flags}") + +# Need to propagate some of the include directories from Qml via QmlDevToolsPrivate +# for other tools, and also for the main QmlDevTools module, +# until we fix the script to handle internal_module to create only one single Private module. +qt_internal_module_info(qml_module "Qml") +set(_qml_dev_tools_private_includes + ${qml_module_include_dir} + ${qml_module_include_dir}/${PROJECT_VERSION} + ${qml_module_include_dir}/${PROJECT_VERSION}/${qml_module} + ) +target_include_directories(QmlDevTools PRIVATE ${_qml_dev_tools_private_includes}) +target_include_directories(QmlDevToolsPrivate INTERFACE ${_qml_dev_tools_private_includes}) +# special case end + #### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>: # CONFIG = "minimal_syncqt" "internal_module" "generated_privates" "qlalr" # MODULE_INCNAME = "QtQml" |