diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-06 13:06:05 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-06 13:06:05 (GMT) |
| commit | f3d2fefd8b65bb20990fde225ca4fe2d65bd2e71 (patch) | |
| tree | 832c3bdd193a7ded2abb86c537dc925fcdfd5cfb /src/plugins/platforms/wayland/qwaylandintegration.cpp | |
| parent | f4ef6fd18a21ec8f8b37f1acbe9488c478420725 (diff) | |
| parent | 6c5cdeb85dba4fd850150a6221aa26ffe82166f6 (diff) | |
| download | Qt-f3d2fefd8b65bb20990fde225ca4fe2d65bd2e71.zip Qt-f3d2fefd8b65bb20990fde225ca4fe2d65bd2e71.tar.gz Qt-f3d2fefd8b65bb20990fde225ca4fe2d65bd2e71.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 3f3ee5e..b6401f6 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -44,6 +44,7 @@ #include "qwaylanddisplay.h" #include "qwaylandshmsurface.h" #include "qwaylandshmwindow.h" +#include "qwaylandnativeinterface.h" #include "qgenericunixfontdatabase.h" @@ -62,9 +63,15 @@ QWaylandIntegration::QWaylandIntegration(bool useOpenGL) : mFontDb(new QGenericUnixFontDatabase()) , mDisplay(new QWaylandDisplay()) , mUseOpenGL(useOpenGL) + , mNativeInterface(new QWaylandNativeInterface) { } +QPlatformNativeInterface * QWaylandIntegration::nativeInterface() const +{ + return mNativeInterface; +} + QList<QPlatformScreen *> QWaylandIntegration::screens() const { |