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

cmake: Don't give plugins PUBLIC usage requirements

Browse Source 
The pro2cmake.py conversion script faithfully reproduced the .pro files
for the plugins, which specified the libraries as public. But in CMake,
the implications of this are that public usage requirements should then
be propagated to consumers. We don't expect any consumers, since a
plugin is created as a MODULE library in CMake, so for Windows we don't
even have an import library to link with. The only exception to this is
for static builds where plugins are created as STATIC libraries
instead, but only in certain controlled situations do we then link to
plugins. Even then, usage requirements are not expected to propagate to
the consumers, so these relationships should always be specified as
private.

This change warns on any PUBLIC usage requirements specified for a
plugin. This check is disabled by default to avoid spamming CI builds
for repos that haven't been fixed yet. The check can be enabled by a
CMake cache option, which is intended for developers to use locally
when fixing this issue in other repos (all plugins in qtbase should
not trigger this warning as a result of changes in this commit).

Task-number: QTBUG-90819
Pick-to: 6.1
Change-Id: I09f2c8da77db1193ad3370f85d367dfc6ab7b9a6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Craig Scott 2021-02-10 12:11:39 +11:00
parent 1f30bcf336
commit fe29159aad
42 changed files with 84 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/QtPluginHelpers.cmake
View File

@ -13,6 +13,23 @@ function(qt_internal_add_plugin target)
"${ARGN}" "${ARGN}"
) )
# Put this behind a cache option for now. It's too noisy for general use
# until most repos are updated.
option(QT_WARN_PLUGIN_PUBLIC_KEYWORDS "Warn if a plugin specifies a PUBLIC keyword")
if(QT_WARN_PLUGIN_PUBLIC_KEYWORDS)
foreach(publicKeyword IN LISTS __default_public_args)
if(NOT "${arg_${publicKeyword}}" STREQUAL "")
string(REPLACE "PUBLIC_" "" privateKeyword "${publicKeyword}")
message(AUTHOR_WARNING
"Plugins are not intended to be linked to. "
"They should not have any public properties, but ${target} "
"sets ${publicKeyword} to the following value:\n"
" ${arg_${publicKeyword}}\n"
"Update your project to use ${privateKeyword} instead.\n")
endif()
endforeach()
endif()
qt_get_sanitized_plugin_type("${arg_TYPE}" plugin_type_escaped) qt_get_sanitized_plugin_type("${arg_TYPE}" plugin_type_escaped)
set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_PLUGINSDIR}/${arg_TYPE}") set(output_directory_default "${QT_BUILD_DIR}/${INSTALL_PLUGINSDIR}/${arg_TYPE}")

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

@ -10,7 +10,7 @@ qt_internal_add_plugin(QEvdevKeyboardPlugin
DEFAULT_IF FALSE DEFAULT_IF FALSE
SOURCES SOURCES
main.cpp main.cpp
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -10,7 +10,7 @@ qt_internal_add_plugin(QEvdevMousePlugin
DEFAULT_IF FALSE DEFAULT_IF FALSE
SOURCES SOURCES
main.cpp main.cpp
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -10,7 +10,7 @@ qt_internal_add_plugin(QEvdevTabletPlugin
DEFAULT_IF FALSE DEFAULT_IF FALSE
SOURCES SOURCES
main.cpp main.cpp
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -10,7 +10,7 @@ qt_internal_add_plugin(QEvdevTouchScreenPlugin
DEFAULT_IF FALSE DEFAULT_IF FALSE
SOURCES SOURCES
main.cpp main.cpp
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -10,7 +10,7 @@ qt_internal_add_plugin(QLibInputPlugin
DEFAULT_IF FALSE DEFAULT_IF FALSE
SOURCES SOURCES
main.cpp main.cpp
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -12,7 +12,7 @@ qt_internal_add_plugin(QTsLibPlugin
DEFAULT_IF FALSE DEFAULT_IF FALSE
SOURCES SOURCES
main.cpp main.cpp
PUBLIC_LIBRARIES LIBRARIES
PkgConfig::Tslib PkgConfig::Tslib
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate

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

@ -17,7 +17,7 @@ qt_internal_add_plugin(QTuioTouchPlugin
qtuiotoken_p.h qtuiotoken_p.h
DEFINES DEFINES
QT_NO_FOREACH QT_NO_FOREACH
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -11,9 +11,8 @@ qt_internal_add_plugin(QGifPlugin
main.cpp main.h main.cpp main.h
qgifhandler.cpp qgifhandler_p.h qgifhandler.cpp qgifhandler_p.h
LIBRARIES # special case LIBRARIES # special case
Qt::GuiPrivate # special case
PUBLIC_LIBRARIES # special case
Qt::Gui # special case Qt::Gui # special case
Qt::GuiPrivate # special case
) )
#### Keys ignored in scope 1:.:.:gif.pro:<TRUE>: #### Keys ignored in scope 1:.:.:gif.pro:<TRUE>:

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

@ -10,7 +10,7 @@ qt_internal_add_plugin(QICOPlugin
SOURCES SOURCES
main.cpp main.h main.cpp main.h
qicohandler.cpp qicohandler.h qicohandler.cpp qicohandler.h
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -12,7 +12,7 @@ qt_internal_add_plugin(QJpegPlugin
SOURCES SOURCES
main.cpp main.h main.cpp main.h
qjpeghandler.cpp qjpeghandler_p.h qjpeghandler.cpp qjpeghandler_p.h
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -15,12 +15,11 @@ qt_internal_add_plugin(QComposePlatformInputContextPlugin
qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h
qcomposeplatforminputcontextmain.cpp qcomposeplatforminputcontextmain.cpp
LIBRARIES LIBRARIES
XKB::XKB
PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
XKB::XKB
) )
#### Keys ignored in scope 1:.:.:compose.pro:<TRUE>: #### Keys ignored in scope 1:.:.:compose.pro:<TRUE>:

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

@ -16,12 +16,11 @@ qt_internal_add_plugin(QIbusPlatformInputContextPlugin
qibusproxyportal.cpp qibusproxyportal.h qibusproxyportal.cpp qibusproxyportal.h
qibustypes.cpp qibustypes.h qibustypes.cpp qibustypes.h
LIBRARIES LIBRARIES
XKB::XKB
PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::DBus Qt::DBus
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
XKB::XKB
) )
#### Keys ignored in scope 1:.:.:ibus.pro:<TRUE>: #### Keys ignored in scope 1:.:.:ibus.pro:<TRUE>:

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

@ -46,7 +46,7 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${QT_SOURCE_TREE}/src/3rdparty/android ${QT_SOURCE_TREE}/src/3rdparty/android
PUBLIC_LIBRARIES LIBRARIES
EGL::EGL EGL::EGL
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate

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

@ -50,7 +50,7 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin
qcocoafontdialoghelper.h qcocoafontdialoghelper.mm qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
DEFINES DEFINES
QT_NO_FOREACH QT_NO_FOREACH
PUBLIC_LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
${FWCarbon} ${FWCarbon}
${FWCoreServices} ${FWCoreServices}

23
src/plugins/platforms/direct2d/CMakeLists.txt
View File

@ -50,27 +50,26 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
../windows ../windows
LIBRARIES LIBRARIES
advapi32
d2d1 # special case
dwrite # special case
gdi32
ole32
shell32
user32
winmm
PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
advapi32
d2d1 # special case
d3d11 d3d11
dwmapi dwmapi
dwrite # special case
dxgi dxgi
dxguid dxguid
gdi32
imm32 imm32
ole32
oleaut32 oleaut32
shell32
shlwapi shlwapi
user32
version version
winmm
winspool winspool
wtsapi32 wtsapi32
) )
@ -102,12 +101,12 @@ qt_internal_add_resource(QWindowsDirect2DIntegrationPlugin "openglblacklists"
# PLUGIN_EXTENDS = "-" # PLUGIN_EXTENDS = "-"
qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
PUBLIC_LIBRARIES LIBRARIES
opengl32 opengl32
) )
qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW
PUBLIC_LIBRARIES LIBRARIES
uuid uuid
) )
@ -272,7 +271,7 @@ qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE
) )
qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
PUBLIC_LIBRARIES LIBRARIES
uuid uuid
) )

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

@ -23,7 +23,7 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
qdirectfbintegration.cpp qdirectfbintegration.h qdirectfbintegration.cpp qdirectfbintegration.h
qdirectfbscreen.cpp qdirectfbscreen.h qdirectfbscreen.cpp qdirectfbscreen.h
qdirectfbwindow.cpp qdirectfbwindow.h qdirectfbwindow.cpp qdirectfbwindow.h
PUBLIC_LIBRARIES LIBRARIES
PkgConfig::DirectFB PkgConfig::DirectFB
EGL::EGL # special case EGL::EGL # special case
Qt::Core Qt::Core

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

@ -102,7 +102,7 @@ qt_internal_add_plugin(QEglFSIntegrationPlugin
qeglfsmain.cpp qeglfsmain.cpp
DEFINES DEFINES
QT_EGL_NO_X11 QT_EGL_NO_X11
PUBLIC_LIBRARIES LIBRARIES
Qt::CorePrivate # special case Qt::CorePrivate # special case
Qt::EglFSDeviceIntegrationPrivate Qt::EglFSDeviceIntegrationPrivate
EGL::EGL # special case EGL::EGL # special case

6
src/plugins/platforms/ios/CMakeLists.txt
View File

@ -27,7 +27,7 @@ qt_internal_add_plugin(QIOSIntegrationPlugin
qioswindow.h qioswindow.mm qioswindow.h qioswindow.mm
quiaccessibilityelement.h quiaccessibilityelement.mm quiaccessibilityelement.h quiaccessibilityelement.mm
quiview.h quiview.mm quiview.h quiview.mm
PUBLIC_LIBRARIES LIBRARIES
${FWAudioToolbox} ${FWAudioToolbox}
${FWFoundation} ${FWFoundation}
${FWMetal} ${FWMetal}
@ -47,7 +47,7 @@ qt_disable_apple_app_extension_api_only(QIOSIntegrationPlugin)
##################################################################### #####################################################################
qt_internal_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl qt_internal_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl
PUBLIC_LIBRARIES LIBRARIES
Qt::OpenGLPrivate Qt::OpenGLPrivate
) )
@ -59,7 +59,7 @@ qt_internal_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
qiosmenu.h qiosmenu.mm qiosmenu.h qiosmenu.mm
qiosmessagedialog.h qiosmessagedialog.mm qiosmessagedialog.h qiosmessagedialog.mm
qiostextinputoverlay.h qiostextinputoverlay.mm qiostextinputoverlay.h qiostextinputoverlay.mm
PUBLIC_LIBRARIES LIBRARIES
${FWAssetsLibrary} ${FWAssetsLibrary}
) )

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

@ -13,7 +13,7 @@ qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibrary
qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm
qiosfileenginefactory.h qiosfileenginefactory.h
qiosimagepickercontroller.h qiosimagepickercontroller.mm qiosimagepickercontroller.h qiosimagepickercontroller.mm
PUBLIC_LIBRARIES LIBRARIES
${FWAssetsLibrary} ${FWAssetsLibrary}
${FWFoundation} ${FWFoundation}
${FWUIKit} ${FWUIKit}

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

@ -14,7 +14,7 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
qlinuxfbscreen.cpp qlinuxfbscreen.h qlinuxfbscreen.cpp qlinuxfbscreen.h
DEFINES DEFINES
QT_NO_FOREACH QT_NO_FOREACH
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::FbSupportPrivate Qt::FbSupportPrivate
@ -29,14 +29,14 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
##################################################################### #####################################################################
qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
PUBLIC_LIBRARIES LIBRARIES
Qt::InputSupportPrivate Qt::InputSupportPrivate
) )
qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate
SOURCES SOURCES
qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h
PUBLIC_LIBRARIES LIBRARIES
Qt::KmsSupportPrivate Qt::KmsSupportPrivate
) )

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

@ -16,7 +16,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
qminimalintegration.cpp qminimalintegration.h qminimalintegration.cpp qminimalintegration.h
DEFINES DEFINES
QT_NO_FOREACH QT_NO_FOREACH
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -16,7 +16,7 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
qminimaleglwindow.cpp qminimaleglwindow.h qminimaleglwindow.cpp qminimaleglwindow.h
DEFINES DEFINES
QT_EGL_NO_X11 QT_EGL_NO_X11
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
@ -33,7 +33,7 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
SOURCES SOURCES
qminimaleglbackingstore.cpp qminimaleglbackingstore.h qminimaleglbackingstore.cpp qminimaleglbackingstore.h
PUBLIC_LIBRARIES LIBRARIES
Qt::OpenGL Qt::OpenGL
) )

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

@ -15,7 +15,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
qoffscreenwindow.cpp qoffscreenwindow.h qoffscreenwindow.cpp qoffscreenwindow.h
DEFINES DEFINES
QT_NO_FOREACH QT_NO_FOREACH
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -16,7 +16,7 @@ qt_internal_add_plugin(QVncIntegrationPlugin
qvncscreen.cpp qvncscreen.h qvncscreen.cpp qvncscreen.h
DEFINES DEFINES
QT_NO_FOREACH QT_NO_FOREACH
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::FbSupportPrivate Qt::FbSupportPrivate
@ -32,7 +32,7 @@ qt_internal_add_plugin(QVncIntegrationPlugin
##################################################################### #####################################################################
qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
PUBLIC_LIBRARIES LIBRARIES
Qt::InputSupportPrivate Qt::InputSupportPrivate
) )

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

@ -43,21 +43,20 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
LIBRARIES LIBRARIES
advapi32
gdi32
ole32
shell32
user32
winmm
PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
advapi32
dwmapi dwmapi
gdi32
imm32 imm32
ole32
oleaut32 oleaut32
shell32
shlwapi shlwapi
user32
winmm
winspool winspool
wtsapi32 wtsapi32
) )
@ -88,7 +87,7 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
SOURCES SOURCES
qwindowsglcontext.cpp qwindowsglcontext.h qwindowsglcontext.cpp qwindowsglcontext.h
qwindowsopenglcontext.h qwindowsopenglcontext.h
PUBLIC_LIBRARIES LIBRARIES
Qt::OpenGLPrivate Qt::OpenGLPrivate
) )
@ -96,12 +95,12 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
# PLUGIN_EXTENDS = "-" # PLUGIN_EXTENDS = "-"
qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
PUBLIC_LIBRARIES LIBRARIES
opengl32 opengl32
) )
qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW
PUBLIC_LIBRARIES LIBRARIES
uuid uuid
) )
@ -195,7 +194,7 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessi
) )
qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
PUBLIC_LIBRARIES LIBRARIES
uuid uuid
) )

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

@ -168,7 +168,7 @@ qt_internal_add_plugin(QXcbIntegrationPlugin
qxcbmain.cpp qxcbmain.cpp
DEFINES DEFINES
QT_NO_FOREACH QT_NO_FOREACH
PUBLIC_LIBRARIES LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::XcbQpaPrivate Qt::XcbQpaPrivate

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

@ -20,7 +20,7 @@ qt_internal_add_plugin(QXcbEglIntegrationPlugin
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
.. ..
../.. ../..
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -18,7 +18,7 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
.. ..
../.. ../..
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
@ -30,12 +30,12 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin
##################################################################### #####################################################################
qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx
PUBLIC_LIBRARIES LIBRARIES
XCB::GLX XCB::GLX
) )
qt_internal_extend_target(QXcbGlxIntegrationPlugin qt_internal_extend_target(QXcbGlxIntegrationPlugin
CONDITION QT_FEATURE_dlopen AND QT_BUILD_SHARED_LIBS CONDITION QT_FEATURE_dlopen AND QT_BUILD_SHARED_LIBS
PUBLIC_LIBRARIES LIBRARIES
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
) )

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

@ -19,13 +19,12 @@ qt_internal_add_plugin(QGtk3ThemePlugin
DEFINES DEFINES
GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6 GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6
LIBRARIES # special case LIBRARIES # special case
X11::X11 # special case
PUBLIC_LIBRARIES
PkgConfig::GTK3 PkgConfig::GTK3
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
X11::X11 # special case
) )
#### Keys ignored in scope 1:.:.:gtk3.pro:<TRUE>: #### Keys ignored in scope 1:.:.:gtk3.pro:<TRUE>:

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

@ -12,7 +12,7 @@ qt_internal_add_plugin(QXdgDesktopPortalThemePlugin
main.cpp main.cpp
qxdgdesktopportalfiledialog.cpp qxdgdesktopportalfiledialog_p.h qxdgdesktopportalfiledialog.cpp qxdgdesktopportalfiledialog_p.h
qxdgdesktopportaltheme.cpp qxdgdesktopportaltheme.h qxdgdesktopportaltheme.cpp qxdgdesktopportaltheme.h
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::DBus Qt::DBus

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

@ -18,7 +18,6 @@ qt_internal_add_plugin(QCupsPrinterSupportPlugin
../../../printsupport/kernel ../../../printsupport/kernel
LIBRARIES LIBRARIES
Cups::Cups Cups::Cups
PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

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

@ -13,7 +13,7 @@ qt_internal_add_plugin(QDB2DriverPlugin
DEFINES DEFINES
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
PUBLIC_LIBRARIES LIBRARIES
DB2::DB2 DB2::DB2
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate

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

@ -7,7 +7,7 @@ qt_internal_add_plugin(QIBaseDriverPlugin
DEFINES DEFINES
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
PUBLIC_LIBRARIES LIBRARIES
Interbase::Interbase Interbase::Interbase
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate

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

@ -13,7 +13,7 @@ qt_internal_add_plugin(QMYSQLDriverPlugin
DEFINES DEFINES
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
PUBLIC_LIBRARIES LIBRARIES
MySQL::MySQL MySQL::MySQL
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate

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

@ -13,7 +13,7 @@ qt_internal_add_plugin(QOCIDriverPlugin
DEFINES DEFINES
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
PUBLIC_LIBRARIES LIBRARIES
Oracle::OCI Oracle::OCI
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate

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

@ -15,7 +15,7 @@ qt_internal_add_plugin(QODBCDriverPlugin
DEFINES DEFINES
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
PUBLIC_LIBRARIES LIBRARIES
ODBC::ODBC ODBC::ODBC
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate

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

@ -15,7 +15,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
DEFINES DEFINES
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
PUBLIC_LIBRARIES LIBRARIES
PostgreSQL::PostgreSQL PostgreSQL::PostgreSQL
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate

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

@ -13,7 +13,7 @@ qt_internal_add_plugin(QSQLiteDriverPlugin
DEFINES DEFINES
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII QT_NO_CAST_TO_ASCII
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::SqlPrivate Qt::SqlPrivate
@ -27,7 +27,7 @@ qt_internal_add_plugin(QSQLiteDriverPlugin
##################################################################### #####################################################################
qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite
PUBLIC_LIBRARIES LIBRARIES
SQLite::SQLite3 SQLite::SQLite3
) )
@ -79,7 +79,7 @@ qt_internal_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_
) )
qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite
PUBLIC_LIBRARIES LIBRARIES
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
) )

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

@ -10,7 +10,7 @@ qt_internal_add_plugin(QAndroidStylePlugin
SOURCES SOURCES
main.cpp main.cpp
qandroidstyle.cpp qandroidstyle_p.h qandroidstyle.cpp qandroidstyle_p.h
PUBLIC_LIBRARIES LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WidgetsPrivate Qt::WidgetsPrivate

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

@ -13,7 +13,6 @@ qt_internal_add_plugin(QMacStylePlugin
qmacstyle_mac_p_p.h qmacstyle_mac_p_p.h
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WidgetsPrivate Qt::WidgetsPrivate

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

@ -17,7 +17,6 @@ qt_internal_add_plugin(QWindowsVistaStylePlugin
gdi32 gdi32
user32 user32
uxtheme uxtheme
PUBLIC_LIBRARIES
Qt::Core Qt::Core
Qt::Gui Qt::Gui
Qt::WidgetsPrivate Qt::WidgetsPrivate