aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-05-31 11:39:43 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-10 18:48:27 +0000
commitbae7deb43ce5f684c21b0e2f3411ee898e48d2bf (patch)
tree78f25e9135ac3d1a0f689a9088c07329ece5323c
parentba10bff2038b0356448f069a4421b77b7545c8bd (diff)
Rename QmlDevTools to QmlDevToolsPrivate
Rename internal modules to adjust their name to the internal module policy. Task-number: QTBUG-87775 Change-Id: I79245c0e555dcf018494faf3f3f30fbf5f944f1f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 63f36746d1b9f07ae8c642be5e47630b5e4b1f79) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qmldevtools/CMakeLists.txt18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt
index 8b6c791735..abe12adfe5 100644
--- a/src/qmldevtools/CMakeLists.txt
+++ b/src/qmldevtools/CMakeLists.txt
@@ -1,10 +1,10 @@
# Generated from qmldevtools.pro.
#####################################################################
-## QmlDevTools Module:
+## QmlDevToolsPrivate Module:
#####################################################################
-qt_internal_add_module(QmlDevTools
+qt_internal_add_module(QmlDevToolsPrivate
STATIC
INTERNAL_MODULE
NO_SYNC_QT
@@ -51,10 +51,10 @@ qt_internal_add_module(QmlDevTools
# special case begin
# Need to generate the parser files as in Qml module.
set(_qt_qlalr_flags "--no-debug" "--qt")
-qt_process_qlalr(QmlDevTools "${CMAKE_CURRENT_SOURCE_DIR}/../qml/parser/qqmljs.g" "${_qt_qlalr_flags}")
+qt_process_qlalr(QmlDevToolsPrivate "${CMAKE_CURRENT_SOURCE_DIR}/../qml/parser/qqmljs.g" "${_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,
+# for other tools, and also for the main QmlDevToolsPrivate module,
# until we fix the script to handle internal_module to create only one single Private module.
qt_internal_module_info(qml_module "Qml")
if(QT_FEATURE_framework)
@@ -73,7 +73,7 @@ else()
$<BUILD_INTERFACE:${qml_module_include_dir}/${PROJECT_VERSION}/${qml_module}>
)
endif()
-target_include_directories(QmlDevTools PUBLIC ${_qml_dev_tools_private_includes})
+target_include_directories(QmlDevToolsPrivate PUBLIC ${_qml_dev_tools_private_includes})
if(QT_FEATURE_framework)
set(_qml_fw_headers_dir lib/${qml_module}.framework/Headers)
set(_qml_dev_tools_public_includes
@@ -88,16 +88,16 @@ else()
$<INSTALL_INTERFACE:${INSTALL_INCLUDEDIR}/${qml_module}/${PROJECT_VERSION}/${qml_module}>
)
endif()
-target_include_directories(QmlDevTools PUBLIC ${_qml_dev_tools_public_includes})
+target_include_directories(QmlDevToolsPrivate PUBLIC ${_qml_dev_tools_public_includes})
# We build the qlalr sources into qmldevtools, so there's no link-time
-# dependency to QtQml. However we also include files in QmlDevTools such
+# dependency to QtQml. However we also include files in QmlDevToolsPrivate such
# as qqmlirbuilder.cpp that include <private/qqmljsgrammar_p.h> that
# originate from QtQml. That particular header was created at cmake time
# via syncqt, but it's just a forwarding header that in turn includes
# the generated file. That generated file is created when building
# QtQml, so we must depend on it:
-add_dependencies(QmlDevTools Qml)
+add_dependencies(QmlDevToolsPrivate Qml)
# special case end
#### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>:
@@ -129,7 +129,7 @@ add_dependencies(QmlDevTools Qml)
# QML_COMPILE_HASH = "$$commit"
# commit = "$$system(git rev-parse HEAD)"
-qt_internal_extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
+qt_internal_extend_target(QmlDevToolsPrivate CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
COMPILE_OPTIONS
-fno-strict-aliasing
)