1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions 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: Ie9e89fa47696244e8ee478ed1a019765c835533e
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2016-02-12 16:50:44 +01:00
parent f52b53996c
commit 9d119e5c96
8 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/platforms/wayland/client.pro
View File

@ -1,17 +1,9 @@
TARGET = QtWaylandClient
MODULE = waylandclient
QT += core-private gui-private
QT_FOR_PRIVATE += platformsupport-private
MODULE=waylandclient
MODULE_PLUGIN_TYPES = \
wayland-graphics-integration-client \
wayland-inputdevice-integration \
wayland-decoration-client
CONFIG += generated_privates
load(qt_module)
# We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
@ -117,3 +109,10 @@ HEADERS += qwaylandintegration_p.h \
include(hardwareintegration/hardwareintegration.pri)
include(shellintegration/shellintegration.pri)
include(inputdeviceintegration/inputdeviceintegration.pri)
CONFIG += generated_privates
MODULE_PLUGIN_TYPES = \
wayland-graphics-integration-client \
wayland-inputdevice-integration \
wayland-decoration-client
load(qt_module)

5
src/plugins/platforms/wayland/plugins/decorations/bradient/bradient.pro
View File

@ -1,6 +1,3 @@
PLUGIN_TYPE = wayland-decoration-client
load(qt_plugin)
QT += waylandclient-private
OTHER_FILES += \
@ -15,3 +12,5 @@ contains(QT_CONFIG, no-pkg-config) {
PKGCONFIG += wayland-client
}
PLUGIN_TYPE = wayland-decoration-client
load(qt_plugin)

5
src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/brcm-egl.pro
View File

@ -1,6 +1,3 @@
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
QT += waylandclient-private
include(../../../../hardwareintegration/client/brcm-egl/brcm-egl.pri)
@ -10,3 +7,5 @@ OTHER_FILES += \
SOURCES += main.cpp
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)

5
src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/drm-egl-server.pro
View File

@ -1,6 +1,3 @@
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
# We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
@ -13,3 +10,5 @@ OTHER_FILES += \
SOURCES += main.cpp
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)

5
src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/libhybris-egl-server.pro
View File

@ -1,6 +1,3 @@
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
QT += waylandclient-private
include(../../../../hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pri)
@ -10,3 +7,5 @@ OTHER_FILES += \
SOURCES += main.cpp
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)

5
src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/wayland-egl.pro
View File

@ -1,6 +1,3 @@
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
QT += waylandclient-private
include(../../../../hardwareintegration/client/wayland-egl/wayland-egl.pri)
@ -10,3 +7,5 @@ OTHER_FILES += \
SOURCES += main.cpp
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)

5
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/xcomposite-egl.pro
View File

@ -1,6 +1,3 @@
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
# We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
@ -13,3 +10,5 @@ OTHER_FILES += xcomposite-egl.json
SOURCES += \
main.cpp
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)

5
src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-glx/xcomposite-glx.pro
View File

@ -1,6 +1,3 @@
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)
QT += waylandclient-private
include(../../../../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri)
@ -10,3 +7,5 @@ OTHER_FILES += xcomposite-glx.json
SOURCES += \
main.cpp
PLUGIN_TYPE = wayland-graphics-integration-client
load(qt_plugin)