diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-09 15:56:55 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-10 09:46:56 +0200 |
commit | 6ee65dc4785b9f38cfd7405a5535c88feb3a0ea1 (patch) | |
tree | ff55c0b4037cc0b9c247667fb887af8b1893a7b9 /src/plugins/platforms/wayland | |
parent | 17763a7b31c1f6df6f7725c4b67e5dcc4d3b00fb (diff) |
QtPlatformSupport: A helper library for platform plugins
QtPlatformSupport is a static library. Platform plugins are meant to
link against this library to pull in dependencies such as fontengines
and convenience functions for finding the right GL configs. The linker
will only pull in the symbols used, so the size of the library doesn't
really matter
Diffstat (limited to 'src/plugins/platforms/wayland')
3 files changed, 5 insertions, 18 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp index 08b6f76daf..c5db44da4b 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp @@ -46,7 +46,7 @@ #include <QtCore/QDebug> #include <QtGui/QRegion> -#include "qeglconvenience.h" +#include "QtPlatformSupport/private/qeglconvenience_p.h" QWaylandXCompositeEGLSurface::QWaylandXCompositeEGLSurface(QWaylandXCompositeEGLWindow *window) : QEGLSurface(window->eglSurface(), window->window()->glFormat()) diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 226bfd44d5..4c2eaa631c 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -47,7 +47,7 @@ #include "qwaylandnativeinterface.h" #include "qwaylandclipboard.h" -#include "qgenericunixfontdatabase.h" +#include "QtPlatformSupport/private/qgenericunixfontdatabase_p.h" #include <QtGui/QWindowSystemInterface> #include <QtGui/QPlatformCursor> diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index b37bfbbb3b..6a6ffdffc0 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -1,14 +1,14 @@ TARGET = qwayland -load(qpa/plugin) +load(qt_plugin) -QT+=gui-private core-private opengl-private +CONFIG += qpa/genericunixfontdatabase DESTDIR = $$QT.gui.plugins/platforms DEFINES += Q_PLATFORM_WAYLAND DEFINES += $$QMAKE_DEFINES_WAYLAND -QT += core-private gui-private opengl-private +QT += core-private gui-private opengl-private platformsupport-private SOURCES = main.cpp \ qwaylandintegration.cpp \ @@ -37,19 +37,6 @@ INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND LIBS += $$QMAKE_LIBS_WAYLAND QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND -INCLUDEPATH += $$PWD - -QT += gui-private -QT += opengl-private -QT += core-private -QT += widgets-private - -include ($$PWD/gl_integration/gl_integration.pri) - -include ($$PWD/windowmanager_integration/windowmanager_integration.pri) - -load(qpa/fontdatabases/genericunix) - target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target |