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

consistently put {qt,qml}_{module,plugin} at the end of project files

Browse Source 
this fixes static builds by ensuring that all dependencies are exported.

Task-number: QTBUG-51071
Change-Id: Icbce502dcbcb4d4b4d922c42679f44e2cc930bf3
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2016-02-12 16:03:42 +01:00
parent 27c87e31dd
commit a28364bc1c
66 changed files with 264 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/concurrent/concurrent.pro
View File

@ -7,8 +7,6 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf
load(qt_module)
PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
SOURCES += \
@ -41,3 +39,5 @@ HEADERS += \
contains(QT_CONFIG, clock-gettime) {
linux-*|hpux-*|solaris-*: LIBS_PRIVATE *= -lrt
}
load(qt_module)

9
src/corelib/corelib.pro
View File

@ -7,6 +7,7 @@ MODULE_CONFIG = moc resources
!isEmpty(QT_NAMESPACE): MODULE_DEFINES = QT_NAMESPACE=$$QT_NAMESPACE
CONFIG += $$MODULE_CONFIG
DEFINES += $$MODULE_DEFINES
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000
irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
@ -31,7 +32,6 @@ ANDROID_PERMISSIONS = \
# variable and on FreeBSD, this variable is in the final executable itself
freebsd: QMAKE_LFLAGS_NOUNDEF =
load(qt_module)
load(qfeatures)
include(animation/animation.pri)
@ -60,8 +60,6 @@ mac|darwin {
LIBS_PRIVATE += -framework CoreFoundation
LIBS_PRIVATE += -framework Foundation
}
win32:DEFINES-=QT_NO_CAST_TO_ASCII
DEFINES += $$MODULE_DEFINES
QMAKE_LIBS += $$QMAKE_LIBS_CORE
@ -78,6 +76,11 @@ qt_conf.variable = QT_CONFIG
QMAKE_PKGCONFIG_VARIABLES += host_bins qt_conf
load(qt_module)
# Override qt_module, so the symbols are actually included into the library.
win32: DEFINES -= QT_NO_CAST_TO_ASCII
ctest_macros_file.input = $$PWD/Qt5CTestMacros.cmake
ctest_macros_file.output = $$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake
ctest_macros_file.CONFIG = verbatim

4
src/dbus/dbus.pro
View File

@ -25,8 +25,6 @@ win32 {
QMAKE_DOCS = $$PWD/doc/qtdbus.qdocconf
load(qt_module)
PUB_HEADERS = qdbusargument.h \
qdbusconnectioninterface.h \
qdbusmacros.h \
@ -91,3 +89,5 @@ SOURCES += qdbusconnection.cpp \
qdbusservicewatcher.cpp \
qdbusunixfiledescriptor.cpp \
qdbusvirtualobject.cpp
load(qt_module)

3
src/gui/gui.pro
View File

@ -23,8 +23,6 @@ win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
\$\$QT_MODULE_INCLUDE_BASE/QtANGLE
}
load(qt_module)
# Code coverage with TestCocoon
# The following is required as extra compilers use $$QMAKE_CXX instead of $(CXX).
# Without this, testcocoon.prf is read only after $$QMAKE_CXX is used by the
@ -50,6 +48,7 @@ include(itemmodels/itemmodels.pri)
QMAKE_LIBS += $$QMAKE_LIBS_GUI
load(qt_module)
load(cmake_functions)
win32: CMAKE_WINDOWS_BUILD = True

9
src/network/network.pro
View File

@ -11,13 +11,8 @@ DEFINES += QT_NO_USING_NAMESPACE
#DEFINES += QUDPSOCKET_DEBUG QUDPSERVER_DEBUG
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000
MODULE_PLUGIN_TYPES = \
bearer
QMAKE_DOCS = $$PWD/doc/qtnetwork.qdocconf
load(qt_module)
include(access/access.pri)
include(bearer/bearer.pri)
include(kernel/kernel.pri)
@ -36,3 +31,7 @@ MODULE_PLUGIN_TYPES = \
bearer
ANDROID_PERMISSIONS += \
android.permission.ACCESS_NETWORK_STATE
MODULE_PLUGIN_TYPES = \
bearer
load(qt_module)

4
src/opengl/opengl.pro
View File

@ -8,8 +8,6 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
load(qt_module)
contains(QT_CONFIG, opengl):CONFIG += opengl
contains(QT_CONFIG, opengles2):CONFIG += opengles2
@ -53,3 +51,5 @@ SOURCES += qglshaderprogram.cpp \
gl2paintengineex/qpaintengineex_opengl2.cpp \
gl2paintengineex/qglcustomshaderstage.cpp \
gl2paintengineex/qtextureglyphcache_gl.cpp
load(qt_module)

4
src/openglextensions/openglextensions.pro
View File

@ -4,11 +4,11 @@ CONFIG += static
contains(QT_CONFIG, opengl):CONFIG += opengl
contains(QT_CONFIG, opengles2):CONFIG += opengles2
load(qt_module)
DEFINES += QT_NO_CAST_FROM_ASCII
PRECOMPILED_HEADER =
HEADERS = qopenglextensions.h
SOURCES = qopenglextensions.cpp
load(qt_module)

8
src/plugins/bearer/android/src/src.pro
View File

@ -2,10 +2,6 @@ include(wrappers/wrappers.pri)
TARGET = qandroidbearer
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QAndroidBearerEnginePlugin
load(qt_plugin)
QT = core-private network-private
HEADERS += qandroidbearerengine.h \
@ -15,3 +11,7 @@ HEADERS += qandroidbearerengine.h \
SOURCES += main.cpp \
qandroidbearerengine.cpp \
../../qnetworksession_impl.cpp
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QAndroidBearerEnginePlugin
load(qt_plugin)

8
src/plugins/bearer/blackberry/blackberry.pro
View File

@ -1,9 +1,5 @@
TARGET = qbbbearer
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QBBEnginePlugin
load(qt_plugin)
QT = core-private network-private
# Uncomment this to enable debugging output for the plugin
@ -18,3 +14,7 @@ SOURCES += qbbengine.cpp \
main.cpp
OTHER_FILES += blackberry.json
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QBBEnginePlugin
load(qt_plugin)

7
src/plugins/bearer/connman/connman.pro
View File

@ -1,9 +1,5 @@
TARGET = qconnmanbearer
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QConnmanEnginePlugin
load(qt_plugin)
QT = core network-private dbus
CONFIG += link_pkgconfig
@ -21,3 +17,6 @@ SOURCES += main.cpp \
OTHER_FILES += connman.json
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QConnmanEnginePlugin
load(qt_plugin)

8
src/plugins/bearer/corewlan/corewlan.pro
View File

@ -1,9 +1,5 @@
TARGET = qcorewlanbearer
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QCoreWlanEnginePlugin
load(qt_plugin)
QT = core-private network-private
LIBS += -framework Foundation -framework SystemConfiguration
@ -21,3 +17,7 @@ SOURCES += main.cpp \
OBJECTIVE_SOURCES += qcorewlanengine.mm
OTHER_FILES += corewlan.json
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QCoreWlanEnginePlugin
load(qt_plugin)

8
src/plugins/bearer/generic/generic.pro
View File

@ -1,9 +1,5 @@
TARGET = qgenericbearer
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QGenericEnginePlugin
load(qt_plugin)
QT = core-private network-private
HEADERS += qgenericengine.h \
@ -15,3 +11,7 @@ SOURCES += qgenericengine.cpp \
main.cpp
OTHER_FILES += generic.json
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QGenericEnginePlugin
load(qt_plugin)

8
src/plugins/bearer/nativewifi/nativewifi.pro
View File

@ -1,9 +1,5 @@
TARGET = qnativewifibearer
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QNativeWifiEnginePlugin
load(qt_plugin)
QT = core-private network-private
HEADERS += qnativewifiengine.h \
@ -16,3 +12,7 @@ SOURCES += main.cpp \
../qnetworksession_impl.cpp
OTHER_FILES += nativewifi.json
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QNativeWifiEnginePlugin
load(qt_plugin)

8
src/plugins/bearer/networkmanager/networkmanager.pro
View File

@ -1,9 +1,5 @@
TARGET = qnmbearer
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QNetworkManagerEnginePlugin
load(qt_plugin)
QT = core network-private dbus
HEADERS += qnetworkmanagerservice.h \
@ -19,3 +15,7 @@ SOURCES += main.cpp \
../qnetworksession_impl.cpp
OTHER_FILES += networkmanager.json
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QNetworkManagerEnginePlugin
load(qt_plugin)

8
src/plugins/bearer/nla/nla.pro
View File

@ -1,9 +1,5 @@
TARGET = qnlabearer
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QNlaEnginePlugin
load(qt_plugin)
QT = core core-private network network-private
!wince* {
@ -22,3 +18,7 @@ SOURCES += main.cpp \
../qnetworksession_impl.cpp
OTHER_FILES += nla.json
PLUGIN_TYPE = bearer
PLUGIN_CLASS_NAME = QNlaEnginePlugin
load(qt_plugin)

9
src/plugins/generic/evdevkeyboard/evdevkeyboard.pro
View File

@ -1,10 +1,5 @@
TARGET = qevdevkeyboardplugin
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QEvdevKeyboardPlugin
load(qt_plugin)
QT += core-private platformsupport-private gui-private
SOURCES = main.cpp
@ -12,3 +7,7 @@ SOURCES = main.cpp
OTHER_FILES += \
evdevkeyboard.json
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QEvdevKeyboardPlugin
load(qt_plugin)

9
src/plugins/generic/evdevmouse/evdevmouse.pro
View File

@ -1,10 +1,5 @@
TARGET = qevdevmouseplugin
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QEvdevMousePlugin
load(qt_plugin)
QT += core-private platformsupport-private gui-private
SOURCES = main.cpp
@ -12,3 +7,7 @@ SOURCES = main.cpp
OTHER_FILES += \
evdevmouse.json
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QEvdevMousePlugin
load(qt_plugin)

10
src/plugins/generic/evdevtablet/evdevtablet.pro
View File

@ -1,13 +1,13 @@
TARGET = qevdevtabletplugin
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QEvdevTabletPlugin
load(qt_plugin)
SOURCES = main.cpp
QT += core-private platformsupport-private gui-private
OTHER_FILES += \
evdevtablet.json
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QEvdevTabletPlugin
load(qt_plugin)

9
src/plugins/generic/evdevtouch/evdevtouch.pro
View File

@ -1,10 +1,5 @@
TARGET = qevdevtouchplugin
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QEvdevTouchScreenPlugin
load(qt_plugin)
SOURCES = main.cpp
QT += core-private platformsupport-private gui-private
@ -12,3 +7,7 @@ QT += core-private platformsupport-private gui-private
OTHER_FILES += \
evdevtouch.json
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QEvdevTouchScreenPlugin
load(qt_plugin)

10
src/plugins/generic/libinput/libinput.pro
View File

@ -1,12 +1,12 @@
TARGET = qlibinputplugin
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QLibInputPlugin
load(qt_plugin)
QT += core-private platformsupport-private gui-private
SOURCES = main.cpp
OTHER_FILES = libinput.json
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QLibInputPlugin
load(qt_plugin)

10
src/plugins/generic/tslib/tslib.pro
View File

@ -1,10 +1,5 @@
TARGET = qtslibplugin
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QTsLibPlugin
load(qt_plugin)
SOURCES = main.cpp
QT += gui-private platformsupport-private
@ -12,3 +7,8 @@ QT += gui-private platformsupport-private
LIBS += -lts
OTHER_FILES += tslib.json
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QTsLibPlugin
load(qt_plugin)

10
src/plugins/generic/tuiotouch/tuiotouch.pro
View File

@ -1,10 +1,5 @@
TARGET = qtuiotouchplugin
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QTuioTouchPlugin
load(qt_plugin)
QT += \
core-private \
gui-private \
@ -24,3 +19,8 @@ HEADERS += \
OTHER_FILES += \
tuiotouch.json
PLUGIN_TYPE = generic
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QTuioTouchPlugin
load(qt_plugin)

8
src/plugins/imageformats/gif/gif.pro
View File

@ -1,11 +1,11 @@
TARGET = qgif
PLUGIN_TYPE = imageformats
PLUGIN_CLASS_NAME = QGifPlugin
load(qt_plugin)
include(../../../gui/image/qgifhandler.pri)
INCLUDEPATH += ../../../gui/image
SOURCES += $$PWD/main.cpp
HEADERS += $$PWD/main.h
OTHER_FILES += gif.json
PLUGIN_TYPE = imageformats
PLUGIN_CLASS_NAME = QGifPlugin
load(qt_plugin)

8
src/plugins/imageformats/ico/ico.pro
View File

@ -1,12 +1,12 @@
TARGET = qico
PLUGIN_TYPE = imageformats
PLUGIN_CLASS_NAME = QICOPlugin
load(qt_plugin)
QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-ico)"
HEADERS += qicohandler.h main.h
SOURCES += main.cpp \
qicohandler.cpp
OTHER_FILES += ico.json
PLUGIN_TYPE = imageformats
PLUGIN_CLASS_NAME = QICOPlugin
load(qt_plugin)

8
src/plugins/imageformats/jpeg/jpeg.pro
View File

@ -1,9 +1,5 @@
TARGET = qjpeg
PLUGIN_TYPE = imageformats
PLUGIN_CLASS_NAME = QJpegPlugin
load(qt_plugin)
QT += core-private
QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)"
@ -13,3 +9,7 @@ INCLUDEPATH += ../../../gui/image
SOURCES += main.cpp
HEADERS += main.h
OTHER_FILES += jpeg.json
PLUGIN_TYPE = imageformats
PLUGIN_CLASS_NAME = QJpegPlugin
load(qt_plugin)

10
src/plugins/platforminputcontexts/compose/compose.pro
View File

@ -1,10 +1,5 @@
TARGET = composeplatforminputcontextplugin
PLUGIN_TYPE = platforminputcontexts
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QComposePlatformInputContextPlugin
load(qt_plugin)
QT += core-private gui-private
DEFINES += X11_PREFIX='\\"$$QMAKE_X11_PREFIX\\"'
@ -27,3 +22,8 @@ contains(QT_CONFIG, xkbcommon-qt): {
}
OTHER_FILES += $$PWD/compose.json
PLUGIN_TYPE = platforminputcontexts
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QComposePlatformInputContextPlugin
load(qt_plugin)

10
src/plugins/platforminputcontexts/ibus/ibus.pro
View File

@ -1,10 +1,5 @@
TARGET = ibusplatforminputcontextplugin
PLUGIN_TYPE = platforminputcontexts
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QIbusPlatformInputContextPlugin
load(qt_plugin)
QT += dbus gui-private
SOURCES += $$PWD/qibusplatforminputcontext.cpp \
$$PWD/qibusproxy.cpp \
@ -18,3 +13,8 @@ HEADERS += $$PWD/qibusplatforminputcontext.h \
$$PWD/qibustypes.h
OTHER_FILES += $$PWD/ibus.json
PLUGIN_TYPE = platforminputcontexts
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QIbusPlatformInputContextPlugin
load(qt_plugin)

7
src/plugins/platforms/android/android.pro
View File

@ -1,13 +1,9 @@
TARGET = qtforandroid
PLUGIN_TYPE = platforms
# STATICPLUGIN needed because there's a Q_IMPORT_PLUGIN in androidjnimain.cpp
# Yes, the plugin imports itself statically
DEFINES += QT_STATICPLUGIN
load(qt_plugin)
LIBS += -ljnigraphics -landroid
QT += core-private gui-private platformsupport-private
@ -79,6 +75,9 @@ HEADERS += $$PWD/qandroidplatformintegration.h \
android-style-assets: SOURCES += $$PWD/extract.cpp
else: SOURCES += $$PWD/extract-dummy.cpp
PLUGIN_TYPE = platforms
load(qt_plugin)
#Non-standard install directory, QTBUG-29859
DESTDIR = $$DESTDIR/android
target.path = $${target.path}/android

10
src/plugins/platforms/cocoa/cocoa.pro
View File

@ -1,10 +1,5 @@
TARGET = qcocoa
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QCocoaIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
OBJECTIVE_SOURCES += main.mm \
qcocoaintegration.mm \
qcocoatheme.mm \
@ -112,3 +107,8 @@ OTHER_FILES += cocoa.json
# Window debug support
#DEFINES += QT_COCOA_ENABLE_WINDOW_DEBUG
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QCocoaIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

10
src/plugins/platforms/direct2d/direct2d.pro
View File

@ -1,10 +1,5 @@
TARGET = qdirect2d
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QWindowsDirect2DIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT *= core-private
QT *= gui-private
QT *= platformsupport-private
@ -40,3 +35,8 @@ HEADERS += \
qwindowsdirect2dwindow.h
OTHER_FILES += direct2d.json
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QWindowsDirect2DIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

10
src/plugins/platforms/directfb/directfb.pro
View File

@ -1,10 +1,5 @@
TARGET = qdirectfb
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QDirectFbIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private
LIBS += $$QMAKE_LIBS_DIRECTFB
@ -51,3 +46,8 @@ contains(QT_CONFIG, directfb_egl) {
CONFIG += qpa/genericunixfontdatabase
OTHER_FILES += directfb.json
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QDirectFbIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm/eglfs_brcm.pro
View File

@ -1,9 +1,5 @@
TARGET = qeglfs-brcm-integration
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSBrcmIntegrationPlugin
load(qt_plugin)
QT += core-private gui-private platformsupport-private eglfs_device_lib-private
INCLUDEPATH += $$PWD/../..
@ -21,3 +17,7 @@ SOURCES += $$PWD/qeglfsbrcmmain.cpp \
HEADERS += $$PWD/qeglfsbrcmintegration.h
OTHER_FILES += $$PWD/eglfs_brcm.json
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSBrcmIntegrationPlugin
load(qt_plugin)

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/eglfs_kms.pro
View File

@ -1,9 +1,5 @@
TARGET = qeglfs-kms-integration
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSKmsIntegrationPlugin
load(qt_plugin)
QT += core-private gui-private platformsupport-private eglfs_device_lib-private
INCLUDEPATH += $$PWD/../..
@ -29,3 +25,7 @@ HEADERS += $$PWD/qeglfskmsintegration.h \
$$PWD/qeglfskmscursor.h
OTHER_FILES += $$PWD/eglfs_kms.json
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSKmsIntegrationPlugin
load(qt_plugin)

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/eglfs_kms_egldevice.pro
View File

@ -1,9 +1,5 @@
TARGET = qeglfs-kms-egldevice-integration
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSKmsEglDeviceIntegrationPlugin
load(qt_plugin)
QT += core-private gui-private platformsupport-private eglfs_device_lib-private
INCLUDEPATH += $$PWD/../..
@ -21,3 +17,7 @@ HEADERS += $$PWD/qeglfskmsegldeviceintegration.h
OTHER_FILES += $$PWD/eglfs_kms_egldevice.json
LIBS += -ldrm
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSKmsEglDeviceIntegrationPlugin
load(qt_plugin)

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro
View File

@ -1,9 +1,5 @@
TARGET = qeglfs-mali-integration
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSMaliIntegrationPlugin
load(qt_plugin)
QT += core-private gui-private platformsupport-private eglfs_device_lib-private
# Avoid X11 header collision
@ -19,3 +15,7 @@ SOURCES += $$PWD/qeglfsmalimain.cpp \
HEADERS += $$PWD/qeglfsmaliintegration.h
OTHER_FILES += $$PWD/eglfs_mali.json
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSMaliIntegrationPlugin
load(qt_plugin)

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/eglfs_viv.pro
View File

@ -1,9 +1,5 @@
TARGET = qeglfs-viv-integration
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSVivIntegrationPlugin
load(qt_plugin)
QT += core-private gui-private platformsupport-private eglfs_device_lib-private
INCLUDEPATH += $$PWD/../..
@ -18,3 +14,7 @@ SOURCES += $$PWD/qeglfsvivmain.cpp \
HEADERS += $$PWD/qeglfsvivintegration.h
OTHER_FILES += $$PWD/eglfs_viv.json
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSVivIntegrationPlugin
load(qt_plugin)

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/eglfs_viv_wl.pro
View File

@ -1,9 +1,5 @@
TARGET = qeglfs-viv-wl-integration
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSVivWaylandIntegrationPlugin
load(qt_plugin)
QT += core-private gui-private platformsupport-private eglfs_device_lib-private
INCLUDEPATH += $$PWD/../..
@ -21,3 +17,7 @@ OTHER_FILES += $$PWD/eglfs_viv_wl.json
CONFIG += link_pkgconfig
PKGCONFIG_PRIVATE += wayland-server
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSVivWaylandIntegrationPlugin
load(qt_plugin)

8
src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro
View File

@ -1,9 +1,5 @@
TARGET = qeglfs-x11-integration
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSX11IntegrationPlugin
load(qt_plugin)
QT += core-private gui-private platformsupport-private eglfs_device_lib-private
# Avoid X11 header collision
@ -21,3 +17,7 @@ SOURCES += $$PWD/qeglfsx11main.cpp \
HEADERS += $$PWD/qeglfsx11integration.h
OTHER_FILES += $$PWD/eglfs_x11.json
PLUGIN_TYPE = egldeviceintegrations
PLUGIN_CLASS_NAME = QEglFSX11IntegrationPlugin
load(qt_plugin)

10
src/plugins/platforms/eglfs/eglfs-plugin.pro
View File

@ -1,12 +1,12 @@
TARGET = qeglfs
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += platformsupport-private eglfs_device_lib-private
SOURCES += $$PWD/qeglfsmain.cpp
OTHER_FILES += $$PWD/eglfs.json
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

4
src/plugins/platforms/eglfs/eglfs_device_lib.pro
View File

@ -6,8 +6,6 @@
TARGET = QtEglDeviceIntegration
CONFIG += no_module_headers internal_module
load(qt_module)
QT += core-private gui-private platformsupport-private
LIBS += $$QMAKE_LIBS_DYNLOAD
@ -52,3 +50,5 @@ INCLUDEPATH += $$PWD
CONFIG += egl qpa/genericunixfontdatabase
!contains(DEFINES, QT_NO_CURSOR): RESOURCES += $$PWD/cursor.qrc
load(qt_module)

7
src/plugins/platforms/haiku/haiku.pro
View File

@ -1,7 +1,4 @@
TARGET = qhaiku
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QHaikuIntegrationPlugin
load(qt_plugin)
QT += platformsupport-private core-private gui-private
@ -40,3 +37,7 @@ LIBS += -lbe
OTHER_FILES += haiku.json
include (../../../platformsupport/fontdatabases/fontdatabases.pri)
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QHaikuIntegrationPlugin
load(qt_plugin)

10
src/plugins/platforms/ios/ios.pro
View File

@ -1,10 +1,5 @@
TARGET = qios
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QIOSIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private
LIBS += -framework Foundation -framework UIKit -framework QuartzCore -framework AssetsLibrary
@ -59,3 +54,8 @@ HEADERS = \
OTHER_FILES = \
quiview_textinput.mm \
quiview_accessibility.mm
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QIOSIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

10
src/plugins/platforms/linuxfb/linuxfb.pro
View File

@ -1,10 +1,5 @@
TARGET = qlinuxfb
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QLinuxFbIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private
SOURCES = main.cpp qlinuxfbintegration.cpp qlinuxfbscreen.cpp
@ -13,3 +8,8 @@ HEADERS = qlinuxfbintegration.h qlinuxfbscreen.h
CONFIG += qpa/genericunixfontdatabase
OTHER_FILES += linuxfb.json
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QLinuxFbIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

10
src/plugins/platforms/minimal/minimal.pro
View File

@ -1,10 +1,5 @@
TARGET = qminimal
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private
SOURCES = main.cpp \
@ -14,3 +9,8 @@ HEADERS = qminimalintegration.h \
qminimalbackingstore.h
OTHER_FILES += minimal.json
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

10
src/plugins/platforms/minimalegl/minimalegl.pro
View File

@ -1,10 +1,5 @@
TARGET = qminimalegl
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QMinimalEglIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private
#DEFINES += QEGL_EXTRA_DEBUG
@ -29,3 +24,8 @@ CONFIG += egl qpa/genericunixfontdatabase
OTHER_FILES += \
minimalegl.json
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QMinimalEglIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

10
src/plugins/platforms/mirclient/mirclient.pro
View File

@ -1,11 +1,6 @@
TARGET = mirclient
TEMPLATE = lib
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = MirServerIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private dbus
CONFIG += qpa/genericunixfontdatabase
@ -47,3 +42,8 @@ HEADERS = \
qmirclientscreen.h \
qmirclienttheme.h \
qmirclientwindow.h
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = MirServerIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

10
src/plugins/platforms/offscreen/offscreen.pro
View File

@ -1,10 +1,5 @@
TARGET = qoffscreen
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QOffscreenIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private
SOURCES = main.cpp \
@ -25,3 +20,8 @@ contains(QT_CONFIG, xlib):contains(QT_CONFIG, opengl):!contains(QT_CONFIG, openg
} else {
SOURCES += qoffscreenintegration_dummy.cpp
}
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QOffscreenIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

9
src/plugins/platforms/openwfd/openwf.pro
View File

@ -1,10 +1,5 @@
TARGET = qopenwf
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QOpenWFDIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private
CONFIG += qpa/genericunixfontdatabase
@ -38,3 +33,7 @@ SOURCES += \
LIBS += -lWFD -lgbm -lGLESv2 -lEGL
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QOpenWFDIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

10
src/plugins/platforms/windows/windows.pro
View File

@ -1,10 +1,5 @@
TARGET = qwindows
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QWindowsIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT *= core-private
QT *= gui-private
QT *= platformsupport-private
@ -25,3 +20,8 @@ HEADERS += \
qwindowsgdinativeinterface.h
OTHER_FILES += windows.json
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QWindowsIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

11
src/plugins/platforms/winrt/winrt.pro
View File

@ -1,10 +1,6 @@
TARGET = qwinrt
CONFIG -= precompile_header
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QWinRTIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
CONFIG -= precompile_header
QT += core-private gui-private platformsupport-private
@ -50,3 +46,8 @@ HEADERS = \
qwinrtwindow.h
OTHER_FILES += winrt.json
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QWinRTIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

9
src/plugins/platforms/xcb/gl_integrations/xcb_egl/xcb_egl.pro
View File

@ -1,10 +1,5 @@
TARGET = qxcb-egl-integration
PLUGIN_CLASS_NAME = QXcbEglIntegrationPlugin
PLUGIN_TYPE = xcbglintegrations
load(qt_plugin)
include(../gl_integrations_plugin_base.pri)
CONFIG += egl
@ -22,3 +17,7 @@ SOURCES += \
qxcbeglwindow.cpp \
qxcbeglmain.cpp \
qxcbeglnativeinterfacehandler.cpp
PLUGIN_CLASS_NAME = QXcbEglIntegrationPlugin
PLUGIN_TYPE = xcbglintegrations
load(qt_plugin)

9
src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
View File

@ -1,10 +1,5 @@
TARGET = qxcb-glx-integration
PLUGIN_CLASS_NAME = QXcbGlxIntegrationPlugin
PLUGIN_TYPE = xcbglintegrations
load(qt_plugin)
include(../gl_integrations_plugin_base.pri)
#should be removed from the sources
@ -31,3 +26,7 @@ SOURCES += \
qxcbglxwindow.cpp \
qglxintegration.cpp \
qxcbglxnativeinterfacehandler.cpp
PLUGIN_CLASS_NAME = QXcbGlxIntegrationPlugin
PLUGIN_TYPE = xcbglintegrations
load(qt_plugin)

9
src/plugins/platforms/xcb/xcb-plugin.pro
View File

@ -1,13 +1,12 @@
TARGET = qxcb
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QXcbIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)
QT += core-private gui-private platformsupport-private xcb_qpa_lib-private
SOURCES = \
qxcbmain.cpp
OTHER_FILES += xcb.json README
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QXcbIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
load(qt_plugin)

3
src/plugins/platforms/xcb/xcb_qpa_lib.pro
View File

@ -1,8 +1,6 @@
TARGET = QtXcbQpa
CONFIG += no_module_headers internal_module
load(qt_module)
QT += core-private gui-private platformsupport-private
SOURCES = \
@ -105,3 +103,4 @@ contains(QT_CONFIG, xkbcommon-qt) {
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
}
load(qt_module)

10
src/plugins/platformthemes/gtk2/gtk2.pro
View File

@ -1,10 +1,5 @@
TARGET = qgtk2
PLUGIN_TYPE = platformthemes
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QGtk2ThemePlugin
load(qt_plugin)
QT += core-private gui-private platformsupport-private
CONFIG += X11
@ -19,3 +14,8 @@ SOURCES += \
main.cpp \
qgtk2dialoghelpers.cpp \
qgtk2theme.cpp \
PLUGIN_TYPE = platformthemes
PLUGIN_EXTENDS = -
PLUGIN_CLASS_NAME = QGtk2ThemePlugin
load(qt_plugin)

7
src/plugins/printsupport/cocoa/cocoa.pro
View File

@ -1,8 +1,5 @@
TARGET = cocoaprintersupport
MODULE = cocoaprintersupport
PLUGIN_TYPE = printsupport
PLUGIN_CLASS_NAME = QCocoaPrinterSupportPlugin
load(qt_plugin)
QT += gui-private printsupport-private
LIBS += -framework Cocoa
@ -10,3 +7,7 @@ LIBS += -framework Cocoa
SOURCES += main.cpp
OTHER_FILES += cocoa.json
PLUGIN_TYPE = printsupport
PLUGIN_CLASS_NAME = QCocoaPrinterSupportPlugin
load(qt_plugin)

7
src/plugins/printsupport/cups/cups.pro
View File

@ -1,8 +1,5 @@
TARGET = cupsprintersupport
MODULE = cupsprintersupport
PLUGIN_TYPE = printsupport
PLUGIN_CLASS_NAME = QCupsPrinterSupportPlugin
load(qt_plugin)
QT += core-private gui-private printsupport printsupport-private
@ -20,3 +17,7 @@ HEADERS += qcupsprintersupport_p.h \
qcupsprintengine_p.h
OTHER_FILES += cups.json
PLUGIN_TYPE = printsupport
PLUGIN_CLASS_NAME = QCupsPrinterSupportPlugin
load(qt_plugin)

7
src/plugins/printsupport/windows/windows.pro
View File

@ -1,8 +1,5 @@
TARGET = windowsprintersupport
MODULE = windowsprintersupport
PLUGIN_TYPE = printsupport
PLUGIN_CLASS_NAME = QWindowsPrinterSupportPlugin
load(qt_plugin)
QT *= core-private
QT *= gui-private
@ -22,3 +19,7 @@ HEADERS += \
OTHER_FILES += windows.json
LIBS += -lwinspool -lcomdlg32 -lgdi32 -luser32
PLUGIN_TYPE = printsupport
PLUGIN_CLASS_NAME = QWindowsPrinterSupportPlugin
load(qt_plugin)

7
src/plugins/styles/bb10style/bb10style.pro
View File

@ -1,9 +1,5 @@
TARGET = bb10styleplugin
PLUGIN_TYPE = styles
PLUGIN_CLASS_NAME = BlackBerry10StylePlugin
load(qt_plugin)
INCLUDEPATH += $$PWD
QT += widgets
@ -26,3 +22,6 @@ RESOURCES += \
OTHER_FILES += qbb10styleplugin.json
PLUGIN_TYPE = styles
PLUGIN_CLASS_NAME = BlackBerry10StylePlugin
load(qt_plugin)

9
src/printsupport/printsupport.pro
View File

@ -3,15 +3,14 @@ QT = core-private gui-private widgets-private
DEFINES += QT_NO_USING_NAMESPACE
MODULE_PLUGIN_TYPES = \
printsupport
QMAKE_DOCS = $$PWD/doc/qtprintsupport.qdocconf
load(qt_module)
QMAKE_LIBS += $$QMAKE_LIBS_PRINTSUPPORT
include(kernel/kernel.pri)
include(widgets/widgets.pri)
include(dialogs/dialogs.pri)
MODULE_PLUGIN_TYPES = \
printsupport
load(qt_module)

9
src/sql/sql.pro
View File

@ -4,13 +4,8 @@ QT = core-private
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000
MODULE_PLUGIN_TYPES = \
sqldrivers
QMAKE_DOCS = $$PWD/doc/qtsql.qdocconf
load(qt_module)
DEFINES += QT_NO_CAST_FROM_ASCII
PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
SQL_P = sql
@ -18,3 +13,7 @@ SQL_P = sql
include(kernel/kernel.pri)
include(drivers/drivers.pri)
include(models/models.pri)
MODULE_PLUGIN_TYPES = \
sqldrivers
load(qt_module)

4
src/tools/bootstrap-dbus/bootstrap-dbus.pro
View File

@ -9,8 +9,6 @@ DEFINES += \
MODULE_INCNAME = QtDBus
load(qt_module)
QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
SOURCES = \
@ -25,5 +23,7 @@ SOURCES = \
../../dbus/qdbus_symbols.cpp \
../../dbus/qdbusunixfiledescriptor.cpp
load(qt_module)
lib.CONFIG = dummy_install
INSTALLS = lib

10
src/tools/bootstrap/bootstrap.pro
View File

@ -27,11 +27,6 @@ DEFINES += \
DEFINES -= QT_EVAL
load(qt_module)
# otherwise mingw headers do not declare common functions like putenv
mingw: CONFIG -= strict_c++
SOURCES += \
../../corelib/codecs/qlatincodec.cpp \
../../corelib/codecs/qtextcodec.cpp \
@ -142,5 +137,10 @@ else:include(../../3rdparty/zlib_dependency.pri)
win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32
load(qt_module)
# otherwise mingw headers do not declare common functions like putenv
mingw: CONFIG -= strict_c++
lib.CONFIG = dummy_install
INSTALLS += lib

10
src/widgets/accessible/widgets.pro
View File

@ -1,10 +1,5 @@
TARGET = qtaccessiblewidgets
PLUGIN_TYPE = accessible
PLUGIN_EXTENDS = widgets
PLUGIN_CLASS_NAME = AccessibleFactory
load(qt_plugin)
QT += core-private gui-private widgets-private
QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"
@ -24,4 +19,7 @@ HEADERS += qaccessiblewidgets.h \
qaccessiblemenu.h \
itemviews.h
PLUGIN_TYPE = accessible
PLUGIN_EXTENDS = widgets
PLUGIN_CLASS_NAME = AccessibleFactory
load(qt_plugin)

9
src/widgets/widgets.pro
View File

@ -8,13 +8,8 @@ DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
MODULE_PLUGIN_TYPES += \
styles
QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf
load(qt_module)
#platforms
mac:include(kernel/mac.pri)
win32:include(kernel/win.pri)
@ -45,3 +40,7 @@ QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtWidgets.dynlist
testcocoon {
load(testcocoon)
}
MODULE_PLUGIN_TYPES += \
styles
load(qt_module)

4
src/xml/xml.pro
View File

@ -6,11 +6,11 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
QMAKE_DOCS = $$PWD/doc/qtxml.qdocconf
load(qt_module)
HEADERS += qtxmlglobal.h
PRECOMPILED_HEADER =
include(dom/dom.pri)
include(sax/sax.pri)
load(qt_module)