AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Regenerate projects to match updated plugin API

Browse Source 
Change-Id: Iafe0a953e74d7f36ec48fa075b3725dd6466c5e3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2020-04-24 14:51:21 +02:00
parent bd24bf740c
commit 6dd90afb76
63 changed files with 100 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/.prev_CMakeLists.txt
View File

@ -135,6 +135,7 @@ qt_add_module(Gui
painting/qplatformbackingstore.cpp painting/qplatformbackingstore.h
painting/qpolygon.cpp painting/qpolygon.h
painting/qpolygonclipper_p.h
painting/qrangecollection.cpp painting/qrangecollection.h painting/qrangecollection_p.h
painting/qrasterdefs_p.h
painting/qrasterizer.cpp painting/qrasterizer_p.h
painting/qrbtree_p.h
@ -304,42 +305,45 @@ qt_extend_target(Gui CONDITION WIN32
#### Keys ignored in scope 8:.:.:gui.pro:WIN32:
# CMAKE_WINDOWS_BUILD = "True"
#### Keys ignored in scope 11:.:.:gui.pro:QT_FEATURE_egl:
#### Keys ignored in scope 10:.:.:gui.pro:NOT mingw OR QT_FEATURE_debug_and_release:
# debug_suffix = "d"
#### Keys ignored in scope 12:.:.:gui.pro:QT_FEATURE_egl:
# CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)"
#### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
#### Keys ignored in scope 13:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
# CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)"
#### Keys ignored in scope 13:.:.:gui.pro:QT_FEATURE_opengles2:
#### Keys ignored in scope 14:.:.:gui.pro:QT_FEATURE_opengles2:
# CMAKE_GL_HEADER_NAME = "GLES2/gl2.h"
# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)"
# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)"
# CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2"
#### Keys ignored in scope 14:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)"
#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
#### Keys ignored in scope 16:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)"
#### Keys ignored in scope 17:.:.:gui.pro:QT_FEATURE_opengl:
#### Keys ignored in scope 18:.:.:gui.pro:QT_FEATURE_opengl:
# CMAKE_GL_HEADER_NAME = "GL/gl.h"
# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)"
# CMAKE_QT_OPENGL_IMPLEMENTATION = "GL"
#### Keys ignored in scope 18:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
#### Keys ignored in scope 19:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)"
#### Keys ignored in scope 19:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
#### Keys ignored in scope 20:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)"
#### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
#### Keys ignored in scope 21:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)"
#### Keys ignored in scope 21:.:.:gui.pro:APPLE:
#### Keys ignored in scope 22:.:.:gui.pro:APPLE:
# CMAKE_GL_HEADER_NAME = "gl.h"
#### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl:
#### Keys ignored in scope 23:.:.:gui.pro:QT_FEATURE_egl:
# CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)"
qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
@ -398,7 +402,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png
WrapPNG::WrapPNG
)
#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND mingw:
#### Keys ignored in scope 39:.:image:image/image.pri:WIN32 AND mingw:
# GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}"
qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND mingw)) AND (GCC_VERSION___equals___8.1.0)
@ -578,7 +582,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
Vulkan::Vulkan_nolink
)
#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
# QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl"
# QMAKE_QVKGEN_INPUT = "vulkan/vk.xml"
# QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL"
@ -594,10 +598,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
# qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
# qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
# qvkgen_h.variable_out = "HEADERS"
#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else:
#### Keys ignored in scope 85:.:vulkan:vulkan/vulkan.pri:else:
# qvkgen_h.CONFIG = "target_predeps" "no_link"
qt_extend_target(Gui CONDITION WASM

32
src/gui/CMakeLists.txt
View File

@ -397,42 +397,45 @@ qt_extend_target(Gui CONDITION WIN32
#### Keys ignored in scope 8:.:.:gui.pro:WIN32:
# CMAKE_WINDOWS_BUILD = "True"
#### Keys ignored in scope 11:.:.:gui.pro:QT_FEATURE_egl:
#### Keys ignored in scope 10:.:.:gui.pro:NOT mingw OR QT_FEATURE_debug_and_release:
# debug_suffix = "d"
#### Keys ignored in scope 12:.:.:gui.pro:QT_FEATURE_egl:
# CMAKE_EGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_EGL)"
#### Keys ignored in scope 12:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
#### Keys ignored in scope 13:.:.:gui.pro:NOT QMAKE_LIBDIR_EGL_ISEMPTY:
# CMAKE_EGL_LIBDIR = "$$cmakeTargetPath($$QMAKE_LIBDIR_EGL)"
#### Keys ignored in scope 13:.:.:gui.pro:QT_FEATURE_opengles2:
#### Keys ignored in scope 14:.:.:gui.pro:QT_FEATURE_opengles2:
# CMAKE_GL_HEADER_NAME = "GLES2/gl2.h"
# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL_ES2)"
# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL_ES2)"
# CMAKE_QT_OPENGL_IMPLEMENTATION = "GLESv2"
#### Keys ignored in scope 14:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ES2_ISEMPTY:
# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL_ES2)"
#### Keys ignored in scope 15:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
#### Keys ignored in scope 16:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ES2_ISEMPTY:
# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL_ES2)"
#### Keys ignored in scope 17:.:.:gui.pro:QT_FEATURE_opengl:
#### Keys ignored in scope 18:.:.:gui.pro:QT_FEATURE_opengl:
# CMAKE_GL_HEADER_NAME = "GL/gl.h"
# CMAKE_OPENGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_OPENGL)"
# CMAKE_QT_OPENGL_IMPLEMENTATION = "GL"
#### Keys ignored in scope 18:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
#### Keys ignored in scope 19:.:.:gui.pro:NOT QMAKE_INCDIR_OPENGL_ISEMPTY:
# CMAKE_GL_INCDIRS = "$$cmakeTargetPaths($$QMAKE_INCDIR_OPENGL)"
#### Keys ignored in scope 19:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
#### Keys ignored in scope 20:.:.:gui.pro:NOT QT_FEATURE_dynamicgl:
# CMAKE_OPENGL_LIBS = "$$cmakeProcessLibs($$QMAKE_LIBS_OPENGL)"
#### Keys ignored in scope 20:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
#### Keys ignored in scope 21:.:.:gui.pro:NOT QMAKE_LIBDIR_OPENGL_ISEMPTY:
# CMAKE_OPENGL_LIBDIR = "$$cmakePortablePaths($$QMAKE_LIBDIR_OPENGL)"
#### Keys ignored in scope 21:.:.:gui.pro:APPLE:
#### Keys ignored in scope 22:.:.:gui.pro:APPLE:
# CMAKE_GL_HEADER_NAME = "gl.h"
#### Keys ignored in scope 22:.:.:gui.pro:QT_FEATURE_egl:
#### Keys ignored in scope 23:.:.:gui.pro:QT_FEATURE_egl:
# CMAKE_EGL_INCDIRS = "$$cmakePortablePaths($$QMAKE_INCDIR_EGL)"
qt_extend_target(Gui CONDITION QT_FEATURE_accessibility
@ -491,7 +494,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png
WrapPNG::WrapPNG
)
#### Keys ignored in scope 38:.:image:image/image.pri:WIN32 AND mingw:
#### Keys ignored in scope 39:.:image:image/image.pri:WIN32 AND mingw:
# GCC_VERSION = "$${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}"
qt_extend_target(Gui CONDITION ((QT_FEATURE_png) AND (WIN32 AND mingw)) AND (GCC_VERSION___equals___8.1.0)
@ -690,7 +693,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
Vulkan::Vulkan_nolink
)
#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
# special case begin
# We must always generate syncqt-injected header files,
# because we added a custom command earlier for those for framework builds.
@ -746,10 +748,10 @@ add_custom_command(
# qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
# qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
# qvkgen_h.variable_out = "HEADERS"
#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else:
#### Keys ignored in scope 85:.:vulkan:vulkan/vulkan.pri:else:
# qvkgen_h.CONFIG = "target_predeps" "no_link"
qt_extend_target(Gui CONDITION WASM

2
src/plugins/generic/evdevkeyboard/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QEvdevKeyboardPlugin Plugin:
#####################################################################
qt_add_plugin(QEvdevKeyboardPlugin
qt_internal_add_plugin(QEvdevKeyboardPlugin
OUTPUT_NAME qevdevkeyboardplugin
TYPE generic
SOURCES

2
src/plugins/generic/evdevmouse/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QEvdevMousePlugin Plugin:
#####################################################################
qt_add_plugin(QEvdevMousePlugin
qt_internal_add_plugin(QEvdevMousePlugin
OUTPUT_NAME qevdevmouseplugin
TYPE generic
SOURCES

2
src/plugins/generic/evdevtablet/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QEvdevTabletPlugin Plugin:
#####################################################################
qt_add_plugin(QEvdevTabletPlugin
qt_internal_add_plugin(QEvdevTabletPlugin
OUTPUT_NAME qevdevtabletplugin
TYPE generic
SOURCES

2
src/plugins/generic/evdevtouch/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QEvdevTouchScreenPlugin Plugin:
#####################################################################
qt_add_plugin(QEvdevTouchScreenPlugin
qt_internal_add_plugin(QEvdevTouchScreenPlugin
OUTPUT_NAME qevdevtouchplugin
TYPE generic
SOURCES

2
src/plugins/generic/libinput/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QLibInputPlugin Plugin:
#####################################################################
qt_add_plugin(QLibInputPlugin
qt_internal_add_plugin(QLibInputPlugin
OUTPUT_NAME qlibinputplugin
TYPE generic
SOURCES

2
src/plugins/generic/tslib/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QTsLibPlugin Plugin:
#####################################################################
qt_add_plugin(QTsLibPlugin
qt_internal_add_plugin(QTsLibPlugin
OUTPUT_NAME qtslibplugin
TYPE generic
SOURCES

2
src/plugins/generic/tslib/CMakeLists.txt
View File

@ -6,7 +6,7 @@ qt_find_package(Tslib) # special case
## QTsLibPlugin Plugin:
#####################################################################
qt_add_plugin(QTsLibPlugin
qt_internal_add_plugin(QTsLibPlugin
OUTPUT_NAME qtslibplugin
TYPE generic
SOURCES

2
src/plugins/generic/tuiotouch/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QTuioTouchPlugin Plugin:
#####################################################################
qt_add_plugin(QTuioTouchPlugin
qt_internal_add_plugin(QTuioTouchPlugin
OUTPUT_NAME qtuiotouchplugin
TYPE generic
SOURCES

2
src/plugins/imageformats/gif/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QGifPlugin Plugin:
#####################################################################
qt_add_plugin(QGifPlugin
qt_internal_add_plugin(QGifPlugin
OUTPUT_NAME qgif
TYPE imageformats
SOURCES

2
src/plugins/imageformats/gif/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QGifPlugin Plugin:
#####################################################################
qt_add_plugin(QGifPlugin
qt_internal_add_plugin(QGifPlugin
OUTPUT_NAME qgif
TYPE imageformats
SOURCES

5
src/plugins/imageformats/ico/.prev_CMakeLists.txt
View File

@ -4,16 +4,15 @@
## QICOPlugin Plugin:
#####################################################################
qt_add_plugin(QICOPlugin
add_qt_plugin(QICOPlugin
OUTPUT_NAME qico
TYPE imageformats
SOURCES
main.cpp main.h
qicohandler.cpp qicohandler.h
LIBRARIES
Qt::CorePrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::CorePrivate
Qt::Gui
)

2
src/plugins/imageformats/ico/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QICOPlugin Plugin:
#####################################################################
qt_add_plugin(QICOPlugin
qt_internal_add_plugin(QICOPlugin
OUTPUT_NAME qico
TYPE imageformats
SOURCES

2
src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QJpegPlugin Plugin:
#####################################################################
qt_add_plugin(QJpegPlugin
qt_internal_add_plugin(QJpegPlugin
OUTPUT_NAME qjpeg
TYPE imageformats
SOURCES

2
src/plugins/imageformats/jpeg/CMakeLists.txt
View File

@ -6,7 +6,7 @@ qt_find_package(JPEG) # special case
## QJpegPlugin Plugin:
#####################################################################
qt_add_plugin(QJpegPlugin
qt_internal_add_plugin(QJpegPlugin
OUTPUT_NAME qjpeg
TYPE imageformats
SOURCES

2
src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QComposePlatformInputContextPlugin Plugin:
#####################################################################
qt_add_plugin(QComposePlatformInputContextPlugin
qt_internal_add_plugin(QComposePlatformInputContextPlugin
OUTPUT_NAME composeplatforminputcontextplugin
TYPE platforminputcontexts
SOURCES

3
src/plugins/platforminputcontexts/compose/CMakeLists.txt
View File

@ -6,7 +6,8 @@
qt_find_package(XKB) # special case
pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case
qt_add_plugin(QComposePlatformInputContextPlugin
qt_internal_add_plugin(QComposePlatformInputContextPlugin
OUTPUT_NAME composeplatforminputcontextplugin
TYPE platforminputcontexts
SOURCES

2
src/plugins/platforminputcontexts/ibus/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QIbusPlatformInputContextPlugin Plugin:
#####################################################################
qt_add_plugin(QIbusPlatformInputContextPlugin
qt_internal_add_plugin(QIbusPlatformInputContextPlugin
OUTPUT_NAME ibusplatforminputcontextplugin
TYPE platforminputcontexts
SOURCES

2
src/plugins/platforms/android/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QAndroidIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QAndroidIntegrationPlugin
qt_internal_add_plugin(QAndroidIntegrationPlugin
OUTPUT_NAME qtforandroid
TYPE platforms
SOURCES

2
src/plugins/platforms/android/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QAndroidIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QAndroidIntegrationPlugin
qt_internal_add_plugin(QAndroidIntegrationPlugin
OUTPUT_NAME qtforandroid
TYPE platforms
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case

2
src/plugins/platforms/cocoa/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QCocoaIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QCocoaIntegrationPlugin
qt_internal_add_plugin(QCocoaIntegrationPlugin
OUTPUT_NAME qcocoa
TYPE platforms
SOURCES

2
src/plugins/platforms/cocoa/CMakeLists.txt
View File

@ -7,7 +7,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups)
## QCocoaIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QCocoaIntegrationPlugin
qt_internal_add_plugin(QCocoaIntegrationPlugin
OUTPUT_NAME qcocoa
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case
TYPE platforms

2
src/plugins/platforms/directfb/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QDirectFbIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QDirectFbIntegrationPlugin
qt_internal_add_plugin(QDirectFbIntegrationPlugin
OUTPUT_NAME qdirectfb
TYPE platforms
SOURCES

2
src/plugins/platforms/directfb/CMakeLists.txt
View File

@ -8,7 +8,7 @@ qt_find_package(DirectFB)
## QDirectFbIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QDirectFbIntegrationPlugin
qt_internal_add_plugin(QDirectFbIntegrationPlugin
OUTPUT_NAME qdirectfb
TYPE platforms
SOURCES

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QEglFSEmulatorIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QEglFSEmulatorIntegrationPlugin
qt_internal_add_plugin(QEglFSEmulatorIntegrationPlugin
OUTPUT_NAME qeglfs-emu-integration
TYPE egldeviceintegrations
SOURCES

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QEglFSKmsGbmIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QEglFSKmsGbmIntegrationPlugin
qt_internal_add_plugin(QEglFSKmsGbmIntegrationPlugin
OUTPUT_NAME qeglfs-kms-integration
TYPE egldeviceintegrations
SOURCES

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QEglFSKmsEglDeviceIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin
OUTPUT_NAME qeglfs-kms-egldevice-integration
TYPE egldeviceintegrations
SOURCES

2
src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QEglFSX11IntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QEglFSX11IntegrationPlugin
qt_internal_add_plugin(QEglFSX11IntegrationPlugin
OUTPUT_NAME qeglfs-x11-integration
TYPE egldeviceintegrations
SOURCES

2
src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QIosOptionalPlugin_NSPhotoLibrary Plugin:
#####################################################################
add_qt_plugin(QIosOptionalPlugin_NSPhotoLibrary
qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
OUTPUT_NAME qiosnsphotolibrarysupport
TYPE platforms/darwin
SOURCES

2
src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QLinuxFbIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QLinuxFbIntegrationPlugin
qt_internal_add_plugin(QLinuxFbIntegrationPlugin
OUTPUT_NAME qlinuxfb
TYPE platforms
SOURCES

2
src/plugins/platforms/linuxfb/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QLinuxFbIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QLinuxFbIntegrationPlugin
qt_internal_add_plugin(QLinuxFbIntegrationPlugin
OUTPUT_NAME qlinuxfb
TYPE platforms
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case

2
src/plugins/platforms/minimal/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QMinimalIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QMinimalIntegrationPlugin
qt_internal_add_plugin(QMinimalIntegrationPlugin
OUTPUT_NAME qminimal
TYPE platforms
SOURCES

2
src/plugins/platforms/minimal/CMakeLists.txt
View File

@ -6,7 +6,7 @@
qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype) # special case
qt_add_plugin(QMinimalIntegrationPlugin
qt_internal_add_plugin(QMinimalIntegrationPlugin
OUTPUT_NAME qminimal
TYPE platforms
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case

2
src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QMinimalEglIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QMinimalEglIntegrationPlugin
qt_internal_add_plugin(QMinimalEglIntegrationPlugin
OUTPUT_NAME qminimalegl
TYPE platforms
SOURCES

2
src/plugins/platforms/minimalegl/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QMinimalEglIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QMinimalEglIntegrationPlugin
qt_internal_add_plugin(QMinimalEglIntegrationPlugin
OUTPUT_NAME qminimalegl
TYPE platforms
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case

2
src/plugins/platforms/offscreen/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QOffscreenIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QOffscreenIntegrationPlugin
qt_internal_add_plugin(QOffscreenIntegrationPlugin
OUTPUT_NAME qoffscreen
TYPE platforms
SOURCES

2
src/plugins/platforms/offscreen/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QOffscreenIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QOffscreenIntegrationPlugin
qt_internal_add_plugin(QOffscreenIntegrationPlugin
OUTPUT_NAME qoffscreen
TYPE platforms
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case

2
src/plugins/platforms/vnc/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QVncIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QVncIntegrationPlugin
qt_internal_add_plugin(QVncIntegrationPlugin
OUTPUT_NAME qvnc
TYPE platforms
SOURCES

2
src/plugins/platforms/vnc/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QVncIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QVncIntegrationPlugin
qt_internal_add_plugin(QVncIntegrationPlugin
OUTPUT_NAME qvnc
TYPE platforms
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case

2
src/plugins/platforms/windows/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QWindowsIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QWindowsIntegrationPlugin
qt_internal_add_plugin(QWindowsIntegrationPlugin
OUTPUT_NAME qwindows
TYPE platforms
SOURCES

2
src/plugins/platforms/windows/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QWindowsIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QWindowsIntegrationPlugin
qt_internal_add_plugin(QWindowsIntegrationPlugin
OUTPUT_NAME qwindows
TYPE platforms
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case

2
src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QXcbEglIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QXcbEglIntegrationPlugin
qt_internal_add_plugin(QXcbEglIntegrationPlugin
OUTPUT_NAME qxcb-egl-integration
TYPE xcbglintegrations
SOURCES

2
src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QXcbGlxIntegrationPlugin Plugin:
#####################################################################
qt_add_plugin(QXcbGlxIntegrationPlugin
qt_internal_add_plugin(QXcbGlxIntegrationPlugin
OUTPUT_NAME qxcb-glx-integration
TYPE xcbglintegrations
SOURCES

2
src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QGtk3ThemePlugin Plugin:
#####################################################################
qt_add_plugin(QGtk3ThemePlugin
qt_internal_add_plugin(QGtk3ThemePlugin
OUTPUT_NAME qgtk3
TYPE platformthemes
SOURCES

2
src/plugins/platformthemes/gtk3/CMakeLists.txt
View File

@ -7,7 +7,7 @@ qt_find_package(X11) # special case
## QGtk3ThemePlugin Plugin:
#####################################################################
qt_add_plugin(QGtk3ThemePlugin
qt_internal_add_plugin(QGtk3ThemePlugin
OUTPUT_NAME qgtk3
TYPE platformthemes
SOURCES

2
src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QXdgDesktopPortalThemePlugin Plugin:
#####################################################################
qt_add_plugin(QXdgDesktopPortalThemePlugin
qt_internal_add_plugin(QXdgDesktopPortalThemePlugin
OUTPUT_NAME qxdgdesktopportal
TYPE platformthemes
SOURCES

2
src/plugins/printsupport/cocoa/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QCocoaPrinterSupportPlugin Plugin:
#####################################################################
qt_add_plugin(QCocoaPrinterSupportPlugin
qt_internal_add_plugin(QCocoaPrinterSupportPlugin
OUTPUT_NAME cocoaprintersupport
TYPE printsupport
SOURCES

2
src/plugins/printsupport/cups/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QCupsPrinterSupportPlugin Plugin:
#####################################################################
qt_add_plugin(QCupsPrinterSupportPlugin
qt_internal_add_plugin(QCupsPrinterSupportPlugin
OUTPUT_NAME cupsprintersupport
TYPE printsupport
SOURCES

2
src/plugins/printsupport/cups/CMakeLists.txt
View File

@ -6,7 +6,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case
## QCupsPrinterSupportPlugin Plugin:
#####################################################################
qt_add_plugin(QCupsPrinterSupportPlugin
qt_internal_add_plugin(QCupsPrinterSupportPlugin
OUTPUT_NAME cupsprintersupport
TYPE printsupport
SOURCES

2
src/plugins/sqldrivers/db2/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QDB2DriverPlugin Plugin:
#####################################################################
qt_add_plugin(QDB2DriverPlugin
qt_internal_add_plugin(QDB2DriverPlugin
OUTPUT_NAME qsqldb2
TYPE sqldrivers
SOURCES

2
src/plugins/sqldrivers/mysql/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QMYSQLDriverPlugin Plugin:
#####################################################################
qt_add_plugin(QMYSQLDriverPlugin
qt_internal_add_plugin(QMYSQLDriverPlugin
OUTPUT_NAME qsqlmysql
TYPE sqldrivers
SOURCES

2
src/plugins/sqldrivers/oci/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QOCIDriverPlugin Plugin:
#####################################################################
qt_add_plugin(QOCIDriverPlugin
qt_internal_add_plugin(QOCIDriverPlugin
OUTPUT_NAME qsqloci
TYPE sqldrivers
SOURCES

2
src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QODBCDriverPlugin Plugin:
#####################################################################
qt_add_plugin(QODBCDriverPlugin
qt_internal_add_plugin(QODBCDriverPlugin
OUTPUT_NAME qsqlodbc
TYPE sqldrivers
SOURCES

3
src/plugins/sqldrivers/odbc/CMakeLists.txt
View File

@ -5,7 +5,8 @@
#####################################################################
qt_find_package(ODBC) # special case
qt_add_plugin(QODBCDriverPlugin
qt_internal_add_plugin(QODBCDriverPlugin
OUTPUT_NAME qsqlodbc
TYPE sqldrivers
SOURCES

2
src/plugins/sqldrivers/psql/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QPSQLDriverPlugin Plugin:
#####################################################################
qt_add_plugin(QPSQLDriverPlugin
qt_internal_add_plugin(QPSQLDriverPlugin
OUTPUT_NAME qsqlpsql
TYPE sqldrivers
SOURCES

2
src/plugins/sqldrivers/psql/CMakeLists.txt
View File

@ -9,7 +9,7 @@ qt_find_package(PostgreSQL) # special case
## QPSQLDriverPlugin Plugin:
#####################################################################
qt_add_plugin(QPSQLDriverPlugin
qt_internal_add_plugin(QPSQLDriverPlugin
OUTPUT_NAME qsqlpsql
TYPE sqldrivers
SOURCES

2
src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QSQLiteDriverPlugin Plugin:
#####################################################################
qt_add_plugin(QSQLiteDriverPlugin
qt_internal_add_plugin(QSQLiteDriverPlugin
OUTPUT_NAME qsqlite
TYPE sqldrivers
SOURCES

2
src/plugins/sqldrivers/sqlite/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QSQLiteDriverPlugin Plugin:
#####################################################################
qt_add_plugin(QSQLiteDriverPlugin
qt_internal_add_plugin(QSQLiteDriverPlugin
OUTPUT_NAME qsqlite
TYPE sqldrivers
SOURCES

2
src/plugins/styles/mac/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QMacStylePlugin Plugin:
#####################################################################
qt_add_plugin(QMacStylePlugin
qt_internal_add_plugin(QMacStylePlugin
OUTPUT_NAME qmacstyle
TYPE styles
SOURCES

2
src/plugins/styles/windowsvista/CMakeLists.txt
View File

@ -4,7 +4,7 @@
## QWindowsVistaStylePlugin Plugin:
#####################################################################
qt_add_plugin(QWindowsVistaStylePlugin
qt_internal_add_plugin(QWindowsVistaStylePlugin
OUTPUT_NAME qwindowsvistastyle
TYPE styles
SOURCES

1
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -152,6 +152,7 @@ qt_add_module(Bootstrap
QT_VERSION_STR=\"\"
INCLUDE_DIRECTORIES
..
../../3rdparty/pcre2/src
../../3rdparty/tinycbor/src
PUBLIC_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/pcre2/src>

1
src/tools/bootstrap/CMakeLists.txt
View File

@ -147,6 +147,7 @@ qt_extend_target(Bootstrap
QT_NO_FOREACH
INCLUDE_DIRECTORIES
..
../../3rdparty/pcre2/src
../../3rdparty/tinycbor/src
PUBLIC_INCLUDE_DIRECTORIES # special case
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/pcre2/src>