aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-04-29 17:55:31 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-10 17:01:11 +0000
commitba10bff2038b0356448f069a4421b77b7545c8bd (patch)
tree743a938206277f8874fcd187e19d972dd53fd998
parent9cbae7368822b1e616f6a0481650d4834a53fdb5 (diff)
Add the 'Private' suffix to the internal module names
Rename internal modules to adjust their name to the internal module policy. Task-number: QTBUG-87775 Change-Id: I99cbc1214c6f0a9085e921df6225768fd55f5b89 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 7b41628d23308a7cda09df3db5346a6e02bbcdb4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/particles/CMakeLists.txt10
-rw-r--r--src/plugins/qmltooling/packetprotocol/CMakeLists.txt4
-rw-r--r--src/qmlcompiler/CMakeLists.txt4
-rw-r--r--src/qmldebug/CMakeLists.txt4
-rw-r--r--src/qmldom/CMakeLists.txt4
-rw-r--r--src/quickshapes/CMakeLists.txt6
-rw-r--r--tests/auto/CMakeLists.txt2
7 files changed, 17 insertions, 17 deletions
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index 076cac11e0..9e98783638 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -2,7 +2,7 @@
## QuickParticles Module:
#####################################################################
-qt_internal_add_qml_module(QuickParticles
+qt_internal_add_qml_module(QuickParticlesPrivate
URI "QtQuick.Particles"
VERSION "${PROJECT_VERSION}"
PLUGIN_TARGET particlesplugin
@@ -58,7 +58,7 @@ set(particles_resource_files
"particleresources/star.png"
)
-qt_internal_add_resource(QuickParticles "particles"
+qt_internal_add_resource(QuickParticlesPrivate "particles"
PREFIX
"/"
FILES
@@ -79,14 +79,14 @@ set(particles1_resource_files
"shaders_ng/imageparticle_tabled.vert.qsb"
)
-qt_internal_add_resource(QuickParticles "particles1"
+qt_internal_add_resource(QuickParticlesPrivate "particles1"
PREFIX
"/particles"
FILES
${particles1_resource_files}
)
-qt_internal_extend_target(QuickParticles CONDITION MSVC
+qt_internal_extend_target(QuickParticlesPrivate CONDITION MSVC
DEFINES
_CRT_SECURE_NO_WARNINGS
)
@@ -94,7 +94,7 @@ qt_internal_extend_target(QuickParticles CONDITION MSVC
#### Keys ignored in scope 3:.:.:particles.pro:solaris-cc_x_:
# QMAKE_CXXFLAGS_RELEASE = "--O2"
-qt_internal_extend_target(QuickParticles CONDITION EXISTS "qqml_enable_gcov"
+qt_internal_extend_target(QuickParticlesPrivate CONDITION EXISTS "qqml_enable_gcov"
LIBRARIES
gcov
COMPILE_OPTIONS
diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
index 30e4296365..bac9e735a1 100644
--- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
+++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
@@ -1,10 +1,10 @@
# Generated from packetprotocol.pro.
#####################################################################
-## PacketProtocol Module:
+## PacketProtocolPrivate Module:
#####################################################################
-qt_internal_add_module(PacketProtocol
+qt_internal_add_module(PacketProtocolPrivate
STATIC
INTERNAL_MODULE
SOURCES
diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt
index 5a8858a91e..311652cca7 100644
--- a/src/qmlcompiler/CMakeLists.txt
+++ b/src/qmlcompiler/CMakeLists.txt
@@ -1,10 +1,10 @@
# Generated from qmlcompiler.pro.
#####################################################################
-## QmlCompiler Module:
+## QmlCompilerPrivate Module:
#####################################################################
-qt_internal_add_module(QmlCompiler
+qt_internal_add_module(QmlCompilerPrivate
STATIC
INTERNAL_MODULE
SOURCES
diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt
index 1801a77793..090585497c 100644
--- a/src/qmldebug/CMakeLists.txt
+++ b/src/qmldebug/CMakeLists.txt
@@ -1,10 +1,10 @@
# Generated from qmldebug.pro.
#####################################################################
-## QmlDebug Module:
+## QmlDebugPrivate Module:
#####################################################################
-qt_internal_add_module(QmlDebug
+qt_internal_add_module(QmlDebugPrivate
STATIC
INTERNAL_MODULE
SOURCES
diff --git a/src/qmldom/CMakeLists.txt b/src/qmldom/CMakeLists.txt
index d8f244c7a7..2387ffe5c7 100644
--- a/src/qmldom/CMakeLists.txt
+++ b/src/qmldom/CMakeLists.txt
@@ -1,10 +1,10 @@
# Generated from qmldom.pro.
#####################################################################
-## QmlDom Module:
+## QmlDomPrivate Module:
#####################################################################
-qt_internal_add_module(QmlDom
+qt_internal_add_module(QmlDomPrivate
STATIC
INTERNAL_MODULE
# NO_SYNC_QT # special case remove, it's actually needed for tests
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index 0f842d79ac..ed219d8728 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -1,8 +1,8 @@
#####################################################################
-## QuickShapes Module:
+## QuickShapesPrivate Module:
#####################################################################
-qt_internal_add_qml_module(QuickShapes
+qt_internal_add_qml_module(QuickShapesPrivate
URI "QtQuick.Shapes"
VERSION "${PROJECT_VERSION}"
PLUGIN_TARGET qmlshapesplugin
@@ -42,7 +42,7 @@ set(qtquickshapes_resource_files
"shaders_ng/radialgradient.vert.qsb"
)
-qt_internal_add_resource(QuickShapes "qtquickshapes"
+qt_internal_add_resource(QuickShapesPrivate "qtquickshapes"
PREFIX
"/qt-project.org/shapes"
FILES
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index aad37dcee0..6701df3016 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -21,6 +21,6 @@ endif()
if(TARGET Qt::QuickWidgets)
add_subdirectory(quickwidgets)
endif()
-if(TARGET Qt::QmlDom)
+if(TARGET Qt::QmlDomPrivate)
add_subdirectory(qmldom)
endif()