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

Update dependencies on 'dev' in qt/qtwayland

Browse Source 
Remove FontDatabaseSupportPrivate/fontdatabase_support-private
in the libraries dependency. The libraries were removed in qtbase in
6be9830d865be32f224e15d13ddefd9c7e176553 and the functionality is now
in QtGui.

Remove PlatformCompositorSupport mentions, it was removed in qtbase
in 7172b5112e5dbf0cb63dec68d2f916a323748aa1, and functionality moved
to QtGui.

Add explicit package dependency on OpenGL, in case if qtdeclarative
modules are missing, so that qtwayland can still be built without
qtdeclarative.

Change-Id: I5e8ec4cddd293e52c288ba629e6ba954c689a803
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Liang Qi 2020-06-16 08:50:58 +02:00 committed by Alexandru Croitor
parent 132579d38c
commit fb8a7a484f
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/wayland/.prev_CMakeLists.txt
View File

@ -55,7 +55,6 @@ qt_add_module(WaylandClient
shellintegration
LIBRARIES
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate

1
src/plugins/platforms/wayland/CMakeLists.txt
View File

@ -55,7 +55,6 @@ qt_add_module(WaylandClient
shellintegration
LIBRARIES
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate

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

@ -3,7 +3,7 @@ MODULE = waylandclient
QT += core-private gui-private
QT_FOR_PRIVATE += service_support-private
QT_PRIVATE += fontdatabase_support-private theme_support-private
QT_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

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

@ -53,10 +53,10 @@
#include "qwaylandscreen_p.h"
#if defined(Q_OS_MACOS)
# include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
# include <QtFontDatabaseSupport/private/qfontengine_coretext_p.h>
# include <QtGui/private/qcoretextfontdatabase_p.h>
# include <QtGui/private/qfontengine_coretext_p.h>
#else
# include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
# include <QtGui/private/qgenericunixfontdatabase_p.h>
#endif
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtThemeSupport/private/qgenericunixthemes_p.h>