diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-06-16 08:50:58 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-16 10:45:07 +0200 |
| commit | 1f37019fd5156ed139108c83b34e12d34d140ac8 (patch) | |
| tree | e1da2a2bf976ea00298ec36ff43011bd72f987d7 /src/client/qwaylandintegration.cpp | |
| parent | 0de4445ee106948645979d24794e55068aca5e03 (diff) | |
| download | qtwayland-1f37019fd5156ed139108c83b34e12d34d140ac8.tar.gz | |
Update dependencies on 'dev' in qt/qtwayland
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>
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index d310a189..97678f33 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -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> |