consistently put {qt,qml}_{module,plugin} at the end of project files
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:
parent
f52b53996c
commit
9d119e5c96
@ -1,17 +1,9 @@
|
|||||||
TARGET = QtWaylandClient
|
TARGET = QtWaylandClient
|
||||||
|
MODULE = waylandclient
|
||||||
|
|
||||||
QT += core-private gui-private
|
QT += core-private gui-private
|
||||||
QT_FOR_PRIVATE += platformsupport-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
|
# We have a bunch of C code with casts, so we can't have this option
|
||||||
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
|
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
|
||||||
|
|
||||||
@ -117,3 +109,10 @@ HEADERS += qwaylandintegration_p.h \
|
|||||||
include(hardwareintegration/hardwareintegration.pri)
|
include(hardwareintegration/hardwareintegration.pri)
|
||||||
include(shellintegration/shellintegration.pri)
|
include(shellintegration/shellintegration.pri)
|
||||||
include(inputdeviceintegration/inputdeviceintegration.pri)
|
include(inputdeviceintegration/inputdeviceintegration.pri)
|
||||||
|
|
||||||
|
CONFIG += generated_privates
|
||||||
|
MODULE_PLUGIN_TYPES = \
|
||||||
|
wayland-graphics-integration-client \
|
||||||
|
wayland-inputdevice-integration \
|
||||||
|
wayland-decoration-client
|
||||||
|
load(qt_module)
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
PLUGIN_TYPE = wayland-decoration-client
|
|
||||||
load(qt_plugin)
|
|
||||||
|
|
||||||
QT += waylandclient-private
|
QT += waylandclient-private
|
||||||
|
|
||||||
OTHER_FILES += \
|
OTHER_FILES += \
|
||||||
@ -15,3 +12,5 @@ contains(QT_CONFIG, no-pkg-config) {
|
|||||||
PKGCONFIG += wayland-client
|
PKGCONFIG += wayland-client
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PLUGIN_TYPE = wayland-decoration-client
|
||||||
|
load(qt_plugin)
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
PLUGIN_TYPE = wayland-graphics-integration-client
|
|
||||||
load(qt_plugin)
|
|
||||||
|
|
||||||
QT += waylandclient-private
|
QT += waylandclient-private
|
||||||
|
|
||||||
include(../../../../hardwareintegration/client/brcm-egl/brcm-egl.pri)
|
include(../../../../hardwareintegration/client/brcm-egl/brcm-egl.pri)
|
||||||
@ -10,3 +7,5 @@ OTHER_FILES += \
|
|||||||
|
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|
||||||
|
PLUGIN_TYPE = wayland-graphics-integration-client
|
||||||
|
load(qt_plugin)
|
||||||
|
@ -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
|
# We have a bunch of C code with casts, so we can't have this option
|
||||||
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
|
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
|
||||||
|
|
||||||
@ -13,3 +10,5 @@ OTHER_FILES += \
|
|||||||
|
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|
||||||
|
PLUGIN_TYPE = wayland-graphics-integration-client
|
||||||
|
load(qt_plugin)
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
PLUGIN_TYPE = wayland-graphics-integration-client
|
|
||||||
load(qt_plugin)
|
|
||||||
|
|
||||||
QT += waylandclient-private
|
QT += waylandclient-private
|
||||||
|
|
||||||
include(../../../../hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pri)
|
include(../../../../hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pri)
|
||||||
@ -10,3 +7,5 @@ OTHER_FILES += \
|
|||||||
|
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|
||||||
|
PLUGIN_TYPE = wayland-graphics-integration-client
|
||||||
|
load(qt_plugin)
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
PLUGIN_TYPE = wayland-graphics-integration-client
|
|
||||||
load(qt_plugin)
|
|
||||||
|
|
||||||
QT += waylandclient-private
|
QT += waylandclient-private
|
||||||
|
|
||||||
include(../../../../hardwareintegration/client/wayland-egl/wayland-egl.pri)
|
include(../../../../hardwareintegration/client/wayland-egl/wayland-egl.pri)
|
||||||
@ -10,3 +7,5 @@ OTHER_FILES += \
|
|||||||
|
|
||||||
SOURCES += main.cpp
|
SOURCES += main.cpp
|
||||||
|
|
||||||
|
PLUGIN_TYPE = wayland-graphics-integration-client
|
||||||
|
load(qt_plugin)
|
||||||
|
@ -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
|
# We have a bunch of C code with casts, so we can't have this option
|
||||||
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
|
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
|
||||||
|
|
||||||
@ -13,3 +10,5 @@ OTHER_FILES += xcomposite-egl.json
|
|||||||
SOURCES += \
|
SOURCES += \
|
||||||
main.cpp
|
main.cpp
|
||||||
|
|
||||||
|
PLUGIN_TYPE = wayland-graphics-integration-client
|
||||||
|
load(qt_plugin)
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
PLUGIN_TYPE = wayland-graphics-integration-client
|
|
||||||
load(qt_plugin)
|
|
||||||
|
|
||||||
QT += waylandclient-private
|
QT += waylandclient-private
|
||||||
|
|
||||||
include(../../../../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri)
|
include(../../../../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri)
|
||||||
@ -10,3 +7,5 @@ OTHER_FILES += xcomposite-glx.json
|
|||||||
SOURCES += \
|
SOURCES += \
|
||||||
main.cpp
|
main.cpp
|
||||||
|
|
||||||
|
PLUGIN_TYPE = wayland-graphics-integration-client
|
||||||
|
load(qt_plugin)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user