diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-29 15:59:36 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-22 14:22:20 +0000 |
| commit | 3443483c9efdcfbfe049f96c83f83a5bf1d81e61 (patch) | |
| tree | 3ba3af4e066bde74e37b9cc101142002f737d941 /src/client | |
| parent | 582c6a379f6a45648352c538a7df4d675c9d0a65 (diff) | |
| download | qtwayland-3443483c9efdcfbfe049f96c83f83a5bf1d81e61.tar.gz | |
use modularized platformsupport modulesv5.8.0-beta1
Change-Id: I7883470e22deb089240d86df7dc2d625a107a53e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/client.pro | 9 | ||||
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 6 | ||||
| -rw-r--r-- | src/client/qwaylandwindowmanagerintegration_p.h | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index fa203674..34955dfb 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -2,13 +2,18 @@ TARGET = QtWaylandClient MODULE = waylandclient QT += core-private gui-private -QT_FOR_PRIVATE += platformsupport-private +QT_FOR_PRIVATE += service_support-private +QT_PRIVATE += fontdatabase_support-private eventdispatcher_support-private theme_support-private # We have a bunch of C code with casts, so we can't have this option QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual +# Prevent gold linker from crashing. +# This started happening when QtPlatformSupport was modularized. +use_gold_linker: CONFIG += no_linker_version_script + CONFIG -= precompile_header -CONFIG += link_pkgconfig qpa/genericunixfontdatabase wayland-scanner +CONFIG += link_pkgconfig wayland-scanner contains(QT_CONFIG, opengl) { DEFINES += QT_WAYLAND_GL_SUPPORT diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 0e9eb44d..48517fce 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -50,9 +50,9 @@ #include "qwaylandwindowmanagerintegration_p.h" #include "qwaylandscreen_p.h" -#include "QtPlatformSupport/private/qgenericunixfontdatabase_p.h" -#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> -#include <QtPlatformSupport/private/qgenericunixthemes_p.h> +#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> +#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> +#include <QtThemeSupport/private/qgenericunixthemes_p.h> #include <QtGui/private/qguiapplication_p.h> diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h index 0e5f67ac..09a79d48 100644 --- a/src/client/qwaylandwindowmanagerintegration_p.h +++ b/src/client/qwaylandwindowmanagerintegration_p.h @@ -55,7 +55,7 @@ #include <QtCore/QScopedPointer> #include <wayland-client.h> -#include <QtPlatformSupport/private/qgenericunixservices_p.h> +#include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtWaylandClient/private/qwayland-qt-windowmanager.h> #include <QtWaylandClient/qwaylandclientexport.h> |