summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/concurrent/CMakeLists.txt1
-rw-r--r--src/corelib/.prev_CMakeLists.txt2
-rw-r--r--src/corelib/CMakeLists.txt2
-rw-r--r--src/dbus/.prev_CMakeLists.txt1
-rw-r--r--src/dbus/CMakeLists.txt1
-rw-r--r--src/gui/.prev_CMakeLists.txt82
-rw-r--r--src/gui/CMakeLists.txt116
-rw-r--r--src/network/.prev_CMakeLists.txt3
-rw-r--r--src/network/CMakeLists.txt4
-rw-r--r--src/opengl/.prev_CMakeLists.txt1
-rw-r--r--src/opengl/CMakeLists.txt1
-rw-r--r--src/printsupport/CMakeLists.txt2
-rw-r--r--src/sql/CMakeLists.txt4
-rw-r--r--src/testlib/.prev_CMakeLists.txt1
-rw-r--r--src/testlib/CMakeLists.txt1
-rw-r--r--src/widgets/.prev_CMakeLists.txt2
-rw-r--r--src/widgets/CMakeLists.txt2
-rw-r--r--src/xml/CMakeLists.txt16
18 files changed, 139 insertions, 103 deletions
diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt
index 56eb2163da..9094cf13db 100644
--- a/src/concurrent/CMakeLists.txt
+++ b/src/concurrent/CMakeLists.txt
@@ -45,3 +45,4 @@ extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i3
add_qt_docs(
doc/qtconcurrent.qdocconf
)
+
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 0b0f9632e3..cad230bd87 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -239,6 +239,7 @@ add_qt_simd_part(Core SIMD mips_dsp
)
+
#### Keys ignored in scope 1:.:.:corelib.pro:<TRUE>:
# ANDROID_BUNDLED_JAR_DEPENDENCIES = "jar/QtAndroid.jar"
# ANDROID_LIB_DEPENDENCIES = "plugins/platforms/android/libqtforandroid.so"
@@ -964,3 +965,4 @@ qt_create_tracepoints(Core qtcore.tracepoints)
add_qt_docs(
doc/qtcore.qdocconf
)
+
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 5313eecfe9..5d45d2b316 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -311,6 +311,7 @@ add_qt_simd_part(Core SIMD mips_dsp
)
+
#### Keys ignored in scope 1:.:.:corelib.pro:<TRUE>:
# ANDROID_BUNDLED_JAR_DEPENDENCIES = "jar/QtAndroid.jar"
# ANDROID_LIB_DEPENDENCIES = "plugins/platforms/android/libqtforandroid.so"
@@ -1074,3 +1075,4 @@ qt_create_tracepoints(Core qtcore.tracepoints)
add_qt_docs(
doc/qtcore.qdocconf
)
+
diff --git a/src/dbus/.prev_CMakeLists.txt b/src/dbus/.prev_CMakeLists.txt
index 852ba7b03f..aee116ffa7 100644
--- a/src/dbus/.prev_CMakeLists.txt
+++ b/src/dbus/.prev_CMakeLists.txt
@@ -72,3 +72,4 @@ extend_target(DBus CONDITION WIN32
add_qt_docs(
doc/qtdbus.qdocconf
)
+
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index 9810167bca..fdfbb485ab 100644
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -75,3 +75,4 @@ extend_target(DBus CONDITION WIN32
add_qt_docs(
doc/qtdbus.qdocconf
)
+
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index dfdf061d6a..815a33117a 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
add_qt_module(Gui
+ PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
SOURCES
image/qbitmap.cpp image/qbitmap.h
image/qbmphandler.cpp image/qbmphandler_p.h
@@ -205,6 +206,7 @@ add_qt_module(Gui
QT_NO_USING_NAMESPACE
LIBRARIES
Qt::CorePrivate
+ ZLIB::ZLIB
PUBLIC_LIBRARIES
Qt::Core
)
@@ -221,18 +223,21 @@ add_qt_simd_part(Gui SIMD sse2
painting/qdrawhelper_sse2.cpp
)
+
add_qt_simd_part(Gui SIMD ssse3
SOURCES
image/qimage_ssse3.cpp
painting/qdrawhelper_ssse3.cpp
)
+
add_qt_simd_part(Gui SIMD sse4_1
SOURCES
painting/qdrawhelper_sse4.cpp
painting/qimagescale_sse4.cpp
)
+
add_qt_simd_part(Gui SIMD neon
SOURCES
image/qimage_neon.cpp
@@ -240,6 +245,7 @@ add_qt_simd_part(Gui SIMD neon
painting/qimagescale_neon.cpp
)
+
add_qt_simd_part(Gui SIMD mips_dsp
SOURCES
painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
@@ -247,6 +253,7 @@ add_qt_simd_part(Gui SIMD mips_dsp
painting/qt_mips_asm_dsp_p.h
)
+
add_qt_simd_part(Gui SIMD mips_dspr2
SOURCES
image/qimage_mips_dspr2.cpp
@@ -254,12 +261,14 @@ add_qt_simd_part(Gui SIMD mips_dspr2
painting/qdrawhelper_mips_dspr2_asm.S
)
+
add_qt_simd_part(Gui SIMD arch_haswell
SOURCES
painting/qdrawhelper_avx2.cpp
)
+
#### Keys ignored in scope 1:.:.:gui.pro:<TRUE>:
# CONFIG = "simd" "optimize_full" "qt_tracepoints"
# MODULE_PLUGIN_TYPES = "platforms" "platforms/darwin" "xcbglintegrations" "platformthemes" "platforminputcontexts" "generic" "iconengines" "imageformats" "egldeviceintegrations"
@@ -270,7 +279,41 @@ add_qt_simd_part(Gui SIMD arch_haswell
## Scopes:
#####################################################################
-#### Keys ignored in scope 2:.:.:gui.pro:qtConfig(opengl._x_):
+extend_target(Gui CONDITION QT_FEATURE_opengl
+ SOURCES
+ kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
+ kernel/qopenglwindow.cpp kernel/qopenglwindow.h
+ kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
+ opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
+ opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h
+ opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
+ opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h
+ opengl/qopengldebug.cpp opengl/qopengldebug.h
+ opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h
+ opengl/qopenglengineshadersource_p.h
+ opengl/qopenglextensions_p.h
+ opengl/qopenglextrafunctions.h
+ opengl/qopenglframebufferobject.cpp opengl/qopenglframebufferobject.h opengl/qopenglframebufferobject_p.h
+ opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
+ opengl/qopenglgradientcache.cpp opengl/qopenglgradientcache_p.h
+ opengl/qopenglpaintdevice.cpp opengl/qopenglpaintdevice.h opengl/qopenglpaintdevice_p.h
+ opengl/qopenglpaintengine.cpp opengl/qopenglpaintengine_p.h
+ opengl/qopenglpixeltransferoptions.cpp opengl/qopenglpixeltransferoptions.h
+ opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
+ opengl/qopenglshadercache_p.h
+ opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h
+ opengl/qopengltexture.cpp opengl/qopengltexture.h opengl/qopengltexture_p.h
+ opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h
+ opengl/qopengltexturecache.cpp opengl/qopengltexturecache_p.h
+ opengl/qopengltextureglyphcache.cpp opengl/qopengltextureglyphcache_p.h
+ opengl/qopengltexturehelper.cpp opengl/qopengltexturehelper_p.h
+ opengl/qopengltextureuploader.cpp opengl/qopengltextureuploader_p.h
+ opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
+ opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
+ opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h
+)
+
+#### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl:
# MODULE_CONFIG = "opengl"
#### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle:
@@ -369,40 +412,6 @@ extend_target(Gui CONDITION QT_FEATURE_draganddrop
kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
)
-extend_target(Gui CONDITION QT_FEATURE_opengl
- SOURCES
- kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
- kernel/qopenglwindow.cpp kernel/qopenglwindow.h
- kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
- opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
- opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h
- opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
- opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h
- opengl/qopengldebug.cpp opengl/qopengldebug.h
- opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h
- opengl/qopenglengineshadersource_p.h
- opengl/qopenglextensions_p.h
- opengl/qopenglextrafunctions.h
- opengl/qopenglframebufferobject.cpp opengl/qopenglframebufferobject.h opengl/qopenglframebufferobject_p.h
- opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
- opengl/qopenglgradientcache.cpp opengl/qopenglgradientcache_p.h
- opengl/qopenglpaintdevice.cpp opengl/qopenglpaintdevice.h opengl/qopenglpaintdevice_p.h
- opengl/qopenglpaintengine.cpp opengl/qopenglpaintengine_p.h
- opengl/qopenglpixeltransferoptions.cpp opengl/qopenglpixeltransferoptions.h
- opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
- opengl/qopenglshadercache_p.h
- opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h
- opengl/qopengltexture.cpp opengl/qopengltexture.h opengl/qopengltexture_p.h
- opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h
- opengl/qopengltexturecache.cpp opengl/qopengltexturecache_p.h
- opengl/qopengltextureglyphcache.cpp opengl/qopengltextureglyphcache_p.h
- opengl/qopengltexturehelper.cpp opengl/qopengltexturehelper_p.h
- opengl/qopengltextureuploader.cpp opengl/qopengltextureuploader_p.h
- opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
- opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
- opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h
-)
-
extend_target(Gui CONDITION QT_FEATURE_movie
SOURCES
image/qmovie.cpp image/qmovie.h
@@ -463,7 +472,7 @@ extend_target(Gui CONDITION QT_FEATURE_cssparser
text/qcssparser.cpp text/qcssparser_p.h
)
-extend_target(Gui CONDITION GCC AND QT_GCC_MAJOR_VERSION___equals___5
+extend_target(Gui CONDITION GCC AND (QT_COMPILER_VERSION_MAJOR STREQUAL 5)
SOURCES
-painting/qdrawhelper.cpp
painting/qdrawhelper.cpp
@@ -551,3 +560,4 @@ qt_create_tracepoints(Gui qtgui.tracepoints)
add_qt_docs(
doc/qtgui.qdocconf
)
+
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 50e966d34d..70ce41aaca 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -39,16 +39,7 @@ endif()
# special case end
add_qt_module(Gui
- PLUGIN_TYPES
- platforms
- platforms/darwin
- xcbglintegrations
- platformthemes
- platforminputcontexts
- generic
- iconengines
- imageformats
- egldeviceintegrations
+ PLUGIN_TYPES platforms platforms/darwin xcbglintegrations platformthemes platforminputcontexts generic iconengines imageformats egldeviceintegrations
FEATURE_DEPENDENCIES # special case:
Qt::Network # special case:
SOURCES
@@ -252,7 +243,7 @@ add_qt_module(Gui
QT_QPA_DEFAULT_PLATFORM_NAME="${QT_QPA_DEFAULT_PLATFORM}" # special case
LIBRARIES
Qt::CorePrivate
- ZLIB::ZLIB # special case
+ ZLIB::ZLIB
PUBLIC_LIBRARIES
Qt::Core
)
@@ -277,18 +268,21 @@ add_qt_simd_part(Gui SIMD sse2
painting/qdrawhelper_sse2.cpp
)
+
add_qt_simd_part(Gui SIMD ssse3
SOURCES
image/qimage_ssse3.cpp
painting/qdrawhelper_ssse3.cpp
)
+
add_qt_simd_part(Gui SIMD sse4_1
SOURCES
painting/qdrawhelper_sse4.cpp
painting/qimagescale_sse4.cpp
)
+
add_qt_simd_part(Gui SIMD neon
SOURCES
image/qimage_neon.cpp
@@ -296,6 +290,7 @@ add_qt_simd_part(Gui SIMD neon
painting/qimagescale_neon.cpp
)
+
add_qt_simd_part(Gui SIMD mips_dsp
SOURCES
painting/qdrawhelper_mips_dsp.cpp painting/qdrawhelper_mips_dsp_p.h
@@ -303,6 +298,7 @@ add_qt_simd_part(Gui SIMD mips_dsp
painting/qt_mips_asm_dsp_p.h
)
+
add_qt_simd_part(Gui SIMD mips_dspr2
SOURCES
image/qimage_mips_dspr2.cpp
@@ -327,6 +323,7 @@ extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
# special case end
+
#### Keys ignored in scope 1:.:.:gui.pro:<TRUE>:
# CONFIG = "simd" "optimize_full" "qt_tracepoints"
# MODULE_PLUGIN_TYPES = "platforms" "platforms/darwin" "xcbglintegrations" "platformthemes" "platforminputcontexts" "generic" "iconengines" "imageformats" "egldeviceintegrations"
@@ -337,7 +334,53 @@ extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
## Scopes:
#####################################################################
-#### Keys ignored in scope 2:.:.:gui.pro:qtConfig(opengl._x_):
+# special case begin
+# With qmake, gui's opengl.pri used CONFIG += opengl, where opengl.prf
+# acted like WrapOpenGL: direct linkage against either libGLESv2 or
+# libGL, depending on the opengl _feature_. This is done by hand now
+# here (where the feature is available).
+# DO NOT MOVE THIS TO THE BEGINNING OF THE FILE, the feature variables are not
+# available until the add_qt_module call.
+qt_find_package(WrapOpenGL PROVIDED_TARGETS WrapOpenGL)
+# special case end
+
+extend_target(Gui CONDITION QT_FEATURE_opengl
+ SOURCES
+ kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
+ kernel/qopenglwindow.cpp kernel/qopenglwindow.h
+ kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
+ opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
+ opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h
+ opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
+ opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h
+ opengl/qopengldebug.cpp opengl/qopengldebug.h
+ opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h
+ opengl/qopenglengineshadersource_p.h
+ opengl/qopenglextensions_p.h
+ opengl/qopenglextrafunctions.h
+ opengl/qopenglframebufferobject.cpp opengl/qopenglframebufferobject.h opengl/qopenglframebufferobject_p.h
+ opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
+ opengl/qopenglgradientcache.cpp opengl/qopenglgradientcache_p.h
+ opengl/qopenglpaintdevice.cpp opengl/qopenglpaintdevice.h opengl/qopenglpaintdevice_p.h
+ opengl/qopenglpaintengine.cpp opengl/qopenglpaintengine_p.h
+ opengl/qopenglpixeltransferoptions.cpp opengl/qopenglpixeltransferoptions.h
+ opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
+ opengl/qopenglshadercache_p.h
+ opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h
+ opengl/qopengltexture.cpp opengl/qopengltexture.h opengl/qopengltexture_p.h
+ opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h
+ opengl/qopengltexturecache.cpp opengl/qopengltexturecache_p.h
+ opengl/qopengltextureglyphcache.cpp opengl/qopengltextureglyphcache_p.h
+ opengl/qopengltexturehelper.cpp opengl/qopengltexturehelper_p.h
+ opengl/qopengltextureuploader.cpp opengl/qopengltextureuploader_p.h
+ opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
+ opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
+ opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h
+ LIBRARIES # special case
+ WrapOpenGL # special case
+)
+
+#### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl:
# MODULE_CONFIG = "opengl"
#### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle:
@@ -436,52 +479,6 @@ extend_target(Gui CONDITION QT_FEATURE_draganddrop
kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
)
-# special case begin
-# With qmake, gui's opengl.pri used CONFIG += opengl, where opengl.prf
-# acted like WrapOpenGL: direct linkage against either libGLESv2 or
-# libGL, depending on the opengl _feature_. This is done by hand now
-# here (where the feature is available).
-# DO NOT MOVE THIS TO THE BEGINNING OF THE FILE, the feature variables are not
-# available until the add_qt_module call.
-qt_find_package(WrapOpenGL PROVIDED_TARGETS WrapOpenGL)
-# special case end
-
-extend_target(Gui CONDITION QT_FEATURE_opengl
- SOURCES
- kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
- kernel/qopenglwindow.cpp kernel/qopenglwindow.h
- kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
- opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
- opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h
- opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
- opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h
- opengl/qopengldebug.cpp opengl/qopengldebug.h
- opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h
- opengl/qopenglengineshadersource_p.h
- opengl/qopenglextensions_p.h
- opengl/qopenglextrafunctions.h
- opengl/qopenglframebufferobject.cpp opengl/qopenglframebufferobject.h opengl/qopenglframebufferobject_p.h
- opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
- opengl/qopenglgradientcache.cpp opengl/qopenglgradientcache_p.h
- opengl/qopenglpaintdevice.cpp opengl/qopenglpaintdevice.h opengl/qopenglpaintdevice_p.h
- opengl/qopenglpaintengine.cpp opengl/qopenglpaintengine_p.h
- opengl/qopenglpixeltransferoptions.cpp opengl/qopenglpixeltransferoptions.h
- opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
- opengl/qopenglshadercache_p.h
- opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h
- opengl/qopengltexture.cpp opengl/qopengltexture.h opengl/qopengltexture_p.h
- opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h
- opengl/qopengltexturecache.cpp opengl/qopengltexturecache_p.h
- opengl/qopengltextureglyphcache.cpp opengl/qopengltextureglyphcache_p.h
- opengl/qopengltexturehelper.cpp opengl/qopengltexturehelper_p.h
- opengl/qopengltextureuploader.cpp opengl/qopengltextureuploader_p.h
- opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
- opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
- opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h
- LIBRARIES # special case
- WrapOpenGL # special case
-)
-
extend_target(Gui CONDITION QT_FEATURE_movie
SOURCES
image/qmovie.cpp image/qmovie.h
@@ -542,7 +539,7 @@ extend_target(Gui CONDITION QT_FEATURE_cssparser
text/qcssparser.cpp text/qcssparser_p.h
)
-# extend_target(Gui CONDITION GCC AND QT_GCC_MAJOR_VERSION___equals___5 ... # special case:
+# extend_target(Gui CONDITION GCC AND (QT_COMPILER_VERSION_MAJOR STREQUAL 5) ... # special case: remove
#### Keys ignored in scope 50:.:painting:painting/painting.pri:NOT APPLE_UIKIT AND NOT WIN32 AND QT_ARCH___contains___arm:
# CONFIG = "no_clang_integrated_as"
@@ -686,3 +683,4 @@ qt_create_tracepoints(Gui qtgui.tracepoints)
add_qt_docs(
doc/qtgui.qdocconf
)
+
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
index 1b901d3050..b1ba59e7be 100644
--- a/src/network/.prev_CMakeLists.txt
+++ b/src/network/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
add_qt_module(Network
+ PLUGIN_TYPES bearer
SOURCES
access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
access/qhsts.cpp access/qhsts_p.h
@@ -56,6 +57,7 @@ add_qt_module(Network
kernel
LIBRARIES
Qt::CorePrivate
+ ZLIB::ZLIB
PUBLIC_LIBRARIES
Qt::Core
)
@@ -427,3 +429,4 @@ extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND WIN32
add_qt_docs(
doc/qtnetwork.qdocconf
)
+
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 4a642835b6..dc4f08e4cd 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
add_qt_module(Network
+ PLUGIN_TYPES bearer
SOURCES
access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h
access/qhsts.cpp access/qhsts_p.h
@@ -56,7 +57,7 @@ add_qt_module(Network
kernel
LIBRARIES
Qt::CorePrivate
- ZLIB::ZLIB # special case
+ ZLIB::ZLIB
PUBLIC_LIBRARIES
Qt::Core
)
@@ -432,3 +433,4 @@ extend_target(Network CONDITION WIN32 LIBRARIES ws2_32) # special case: mkspecs/
add_qt_docs(
doc/qtnetwork.qdocconf
)
+
diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt
index 759b1a7083..2844fac32d 100644
--- a/src/opengl/.prev_CMakeLists.txt
+++ b/src/opengl/.prev_CMakeLists.txt
@@ -63,3 +63,4 @@ extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect
add_qt_docs(
doc/qtopengl.qdocconf
)
+
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index af77dde8a2..53a59b3434 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -64,3 +64,4 @@ extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect
add_qt_docs(
doc/qtopengl.qdocconf
)
+
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
index bdb93042d5..5215961f61 100644
--- a/src/printsupport/CMakeLists.txt
+++ b/src/printsupport/CMakeLists.txt
@@ -5,6 +5,7 @@
#####################################################################
add_qt_module(PrintSupport
+ PLUGIN_TYPES printsupport
SOURCES
kernel/qpaintengine_alpha.cpp kernel/qpaintengine_alpha_p.h
kernel/qplatformprintdevice.cpp kernel/qplatformprintdevice.h
@@ -153,3 +154,4 @@ extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog
add_qt_docs(
doc/qtprintsupport.qdocconf
)
+
diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index 8f728e7079..8e9345765f 100644
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -5,8 +5,7 @@
#####################################################################
add_qt_module(Sql
- PLUGIN_TYPES
- sqldrivers
+ PLUGIN_TYPES sqldrivers
SOURCES
kernel/qsqlcachedresult.cpp kernel/qsqlcachedresult_p.h
kernel/qsqldatabase.cpp kernel/qsqldatabase.h
@@ -54,3 +53,4 @@ extend_target(Sql CONDITION QT_FEATURE_sqlmodel
add_qt_docs(
doc/qtsql.qdocconf
)
+
diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt
index aef2ceefd0..82bc8341bb 100644
--- a/src/testlib/.prev_CMakeLists.txt
+++ b/src/testlib/.prev_CMakeLists.txt
@@ -139,3 +139,4 @@ extend_target(Test CONDITION ((APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_
add_qt_docs(
doc/qttestlib.qdocconf
)
+
diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
index 92864a9e01..9acbe76e0f 100644
--- a/src/testlib/CMakeLists.txt
+++ b/src/testlib/CMakeLists.txt
@@ -122,3 +122,4 @@ extend_target(Test CONDITION APPLE_OSX
add_qt_docs(
doc/qttestlib.qdocconf
)
+
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt
index 6d4691d8f8..f8ae83025c 100644
--- a/src/widgets/.prev_CMakeLists.txt
+++ b/src/widgets/.prev_CMakeLists.txt
@@ -6,6 +6,7 @@
add_qt_module(Widgets
QMAKE_MODULE_CONFIG uic
+ PLUGIN_TYPES styles
SOURCES
itemviews/qfileiconprovider.cpp itemviews/qfileiconprovider.h itemviews/qfileiconprovider_p.h
kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
@@ -796,3 +797,4 @@ qt_create_tracepoints(Widgets qtwidgets.tracepoints)
add_qt_docs(
doc/qtwidgets.qdocconf
)
+
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 5532f7387d..a4c4ea16a3 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -6,6 +6,7 @@
add_qt_module(Widgets
QMAKE_MODULE_CONFIG uic
+ PLUGIN_TYPES styles
SOURCES
itemviews/qfileiconprovider.cpp itemviews/qfileiconprovider.h itemviews/qfileiconprovider_p.h
kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
@@ -800,3 +801,4 @@ qt_create_tracepoints(Widgets qtwidgets.tracepoints)
add_qt_docs(
doc/qtwidgets.qdocconf
)
+
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 7ce740476c..6c7ad3489e 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -10,20 +10,26 @@ add_qt_module(Xml
qtxmlglobal.h
sax/qxml.cpp sax/qxml.h sax/qxml_p.h
DEFINES
- QT_NO_USING_NAMESPACE
QT_NO_FOREACH
+ QT_NO_USING_NAMESPACE
LIBRARIES
Qt::CorePrivate
- # PRECOMPILED_HEADER = <EMPTY>
- # _LOADED = "qt_module"
+ PUBLIC_LIBRARIES
+ Qt::Core
)
+#### Keys ignored in scope 1:.:.:xml.pro:<TRUE>:
+# PRECOMPILED_HEADER = <EMPTY>
+# _LOADED = "qt_module"
+
## Scopes:
#####################################################################
-extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+extend_target(Xml CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
LINK_OPTIONS
"/BASE:0x61000000"
)
+add_qt_docs(
+ doc/qtxml.qdocconf
+)
-add_qt_docs(./doc/qtxml.qdocconf)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 17:59:19 +0000