1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use modularized platformsupport modules

Browse Source 
Change-Id: I7883470e22deb089240d86df7dc2d625a107a53e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-09-29 15:59:36 +02:00 committed by Lars Knoll
parent 3850310051
commit ac24d8341e
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,18 @@ TARGET = QtWaylandClient
MODULE = waylandclient MODULE = waylandclient
QT += core-private gui-private 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 # 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
# Prevent gold linker from crashing.
# This started happening when QtPlatformSupport was modularized.
use_gold_linker: CONFIG += no_linker_version_script
CONFIG -= precompile_header CONFIG -= precompile_header
CONFIG += link_pkgconfig qpa/genericunixfontdatabase wayland-scanner CONFIG += link_pkgconfig wayland-scanner
contains(QT_CONFIG, opengl) { contains(QT_CONFIG, opengl) {
DEFINES += QT_WAYLAND_GL_SUPPORT DEFINES += QT_WAYLAND_GL_SUPPORT

6
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -50,9 +50,9 @@
#include "qwaylandwindowmanagerintegration_p.h" #include "qwaylandwindowmanagerintegration_p.h"
#include "qwaylandscreen_p.h" #include "qwaylandscreen_p.h"
#include "QtPlatformSupport/private/qgenericunixfontdatabase_p.h" #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtPlatformSupport/private/qgenericunixthemes_p.h> #include <QtThemeSupport/private/qgenericunixthemes_p.h>
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>

2
src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
View File

@ -55,7 +55,7 @@
#include <QtCore/QScopedPointer> #include <QtCore/QScopedPointer>
#include <wayland-client.h> #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/private/qwayland-qt-windowmanager.h>
#include <QtWaylandClient/qwaylandclientexport.h> #include <QtWaylandClient/qwaylandclientexport.h>