qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add the 'Private' suffix to the internal module names 

Rename internal modules to adjust their name to the internal module
policy.

Pick-to: 6.2
Task-number: QTBUG-87775
Change-Id: I99cbc1214c6f0a9085e921df6225768fd55f5b89
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2021-04-29 17:55:31 +02:00
parent c60dc57dda
commit 7b41628d23
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/particles/CMakeLists.txt
View File

@ -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

4
src/plugins/qmltooling/packetprotocol/CMakeLists.txt
View File

@ -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

4
src/qmlcompiler/CMakeLists.txt
View File

@ -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

4
src/qmldebug/CMakeLists.txt
View File

@ -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

4
src/qmldom/CMakeLists.txt
View File

@ -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

6
src/quickshapes/CMakeLists.txt
View File

@ -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

2
tests/auto/CMakeLists.txt
View File

@ -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()