summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xlib/qxlibintegration.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-03-31 14:05:42 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-04-06 09:47:52 (GMT)
commit8fe7b21fbd55e3121925e6f5a51be8d14081957f (patch)
treeccf0a2fc4249214e62b08f5cba1fafa294705543 /src/plugins/platforms/xlib/qxlibintegration.cpp
parent9086024565cac2fd9ebc7eeb8abd6449ecf960d0 (diff)
downloadQt-8fe7b21fbd55e3121925e6f5a51be8d14081957f.zip
Qt-8fe7b21fbd55e3121925e6f5a51be8d14081957f.tar.gz
Qt-8fe7b21fbd55e3121925e6f5a51be8d14081957f.tar.bz2
Lighthouse: Native interface for xlib
Diffstat (limited to 'src/plugins/platforms/xlib/qxlibintegration.cpp')
-rw-r--r--src/plugins/platforms/xlib/qxlibintegration.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/platforms/xlib/qxlibintegration.cpp b/src/plugins/platforms/xlib/qxlibintegration.cpp
index 63197b0..8deb2f3 100644
--- a/src/plugins/platforms/xlib/qxlibintegration.cpp
+++ b/src/plugins/platforms/xlib/qxlibintegration.cpp
@@ -49,6 +49,7 @@
#include "qxlibscreen.h"
#include "qxlibclipboard.h"
#include "qxlibdisplay.h"
+#include "qxlibnativeinterface.h"
#if !defined(QT_NO_OPENGL)
#if !defined(QT_OPENGL_ES_2)
@@ -66,6 +67,7 @@ QXlibIntegration::QXlibIntegration(bool useOpenGL)
: mUseOpenGL(useOpenGL)
, mFontDb(new QGenericUnixFontDatabase())
, mClipboard(0)
+ , mNativeInterface(new QXlibNativeInterface)
{
mPrimaryScreen = new QXlibScreen();
mScreens.append(mPrimaryScreen);
@@ -130,6 +132,11 @@ QPlatformClipboard * QXlibIntegration::clipboard() const
return mClipboard;
}
+QPlatformNativeInterface * QXlibIntegration::nativeInterface() const
+{
+ return mNativeInterface;
+}
+
bool QXlibIntegration::hasOpenGL() const
{
#if !defined(QT_NO_OPENGL)
@@ -154,5 +161,4 @@ bool QXlibIntegration::hasOpenGL() const
return false;
}
-
QT_END_NAMESPACE