diff options
20 files changed, 53 insertions, 68 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 8bd9e1dc..1a077983 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -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) diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index cf6300c0..710fa2dc 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -3,9 +3,6 @@ QT = core gui-private contains(QT_CONFIG, opengl):MODULE_DEFINES = QT_COMPOSITOR_WAYLAND_GL -MODULE_PLUGIN_TYPES = wayland-graphics-integration-server -load(qt_module) - CONFIG -= precompile_header CONFIG += link_pkgconfig @@ -27,4 +24,6 @@ include ($$PWD/hardware_integration/hardware_integration.pri) include ($$PWD/compositor_api/compositor_api.pri) include ($$PWD/windowmanagerprotocol/windowmanagerprotocol.pri) - +MODULE_PLUGIN_TYPES = \ + wayland-graphics-integration-server +load(qt_module) diff --git a/src/plugins/decorations/bradient/bradient.pro b/src/plugins/decorations/bradient/bradient.pro index fd376f4a..0f62db9c 100644 --- a/src/plugins/decorations/bradient/bradient.pro +++ b/src/plugins/decorations/bradient/bradient.pro @@ -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) diff --git a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro index 6dbe5373..550343cf 100644 --- a/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro +++ b/src/plugins/hardwareintegration/client/brcm-egl/brcm-egl.pro @@ -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) diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro index 827228d2..29a48c9e 100644 --- a/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro +++ b/src/plugins/hardwareintegration/client/drm-egl-server/drm-egl-server.pro @@ -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) diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro index 55f98415..d7bf0370 100644 --- a/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro +++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/libhybris-egl-server.pro @@ -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) diff --git a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro index 38989628..076b6af2 100644 --- a/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro +++ b/src/plugins/hardwareintegration/client/wayland-egl/wayland-egl.pro @@ -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) diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro index 1af17866..031d2812 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro +++ b/src/plugins/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pro @@ -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) diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro index 0080150c..eb8e03c7 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pro @@ -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) diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro index f47898a4..615b6914 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = wayland-graphics-integration-server -load(qt_plugin) - QT = compositor compositor-private core-private gui-private OTHER_FILES += brcm-egl.json @@ -9,3 +6,6 @@ SOURCES += \ main.cpp include(../../../../hardwareintegration/compositor/brcm-egl/brcm-egl.pri) + +PLUGIN_TYPE = wayland-graphics-integration-server +load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro index 4e269393..2c428dfb 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = wayland-graphics-integration-server -load(qt_plugin) - QT = compositor compositor-private core-private gui-private OTHER_FILES += drm-egl-server.json @@ -10,3 +7,5 @@ SOURCES += \ include($PWD/../../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri) +PLUGIN_TYPE = wayland-graphics-integration-server +load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro index fb59c40a..039455c1 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = wayland-graphics-integration-server -load(qt_plugin) - QT = compositor compositor-private core-private gui-private OTHER_FILES += libhybris-egl-server.json @@ -10,3 +7,5 @@ SOURCES += \ include($PWD/../../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri) +PLUGIN_TYPE = wayland-graphics-integration-server +load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro index c1a23cd6..48e59770 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = wayland-graphics-integration-server -load(qt_plugin) - QT = compositor compositor-private core-private gui-private platformsupport-private OTHER_FILES += wayland-egl.json @@ -9,3 +6,6 @@ SOURCES += \ main.cpp include(../../../../hardwareintegration/compositor/wayland-egl/wayland-egl.pri) + +PLUGIN_TYPE = wayland-graphics-integration-server +load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro index 059e462c..93cebcbc 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = wayland-graphics-integration-server -load(qt_plugin) - QT += compositor compositor-private core-private gui-private OTHER_FILES += xcomposite-egl.json @@ -9,3 +6,6 @@ SOURCES += \ main.cpp include(../../../../hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pri) + +PLUGIN_TYPE = wayland-graphics-integration-server +load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro index d8d6f0e0..880be8ce 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = wayland-graphics-integration-server -load(qt_plugin) - QT += compositor compositor-private core-private gui-private OTHER_FILES += xcomposite-glx.json @@ -9,3 +6,6 @@ SOURCES += \ main.cpp include(../../../../hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri) + +PLUGIN_TYPE = wayland-graphics-integration-server +load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro b/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro index 1e28043a..4ff61713 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro +++ b/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = platforms -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 = platforms +load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro index 279a7c38..b64a8cc4 100644 --- a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro +++ b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = platforms -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 = platforms +load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro b/src/plugins/platforms/qwayland-generic/qwayland-generic.pro index cf42d1eb..5457e9df 100644 --- a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro +++ b/src/plugins/platforms/qwayland-generic/qwayland-generic.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = platforms -load(qt_plugin) - QT += waylandclient-private OTHER_FILES += \ @@ -8,3 +5,5 @@ OTHER_FILES += \ SOURCES += main.cpp +PLUGIN_TYPE = platforms +load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro b/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro index 74a71a57..7c7a3dd2 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = platforms -load(qt_plugin) - QT += waylandclient-private include(../../../hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri) @@ -10,3 +7,5 @@ OTHER_FILES += qwayland-xcomposite-egl.json SOURCES += \ main.cpp +PLUGIN_TYPE = platforms +load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro b/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro index 307ad5ed..c0c12c9d 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro @@ -1,6 +1,3 @@ -PLUGIN_TYPE = platforms -load(qt_plugin) - QT += waylandclient-private include(../../../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri) @@ -12,3 +9,6 @@ SOURCES += \ HEADERS += \ qwaylandxcompositeglxplatformintegration.h + +PLUGIN_TYPE = platforms +load(qt_plugin) |