summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@digia.com>2014-08-14 13:10:31 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2014-08-15 13:01:00 +0200
commit63ec4d42c0d32a22f7fc808ef0ac9018ae443d50 (patch)
tree3a55a5172c0ff16e3ab514aa4a2414573c44a53a
parent6f7bc2a7074b7f8c9dacd997d4af597396bbc8d0 (diff)
DirectFB define platform integration capabilities
Make sure that the DirectFB plugin defines that it is capable of using Threaded Pixmaps, Multiple Windows, and OpenGL when available. Change-Id: I68a0a69568af8e00e47cd2c59bbf6a301df6ec34 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--src/plugins/platforms/directfb/qdirectfbintegration.cpp13
-rw-r--r--src/plugins/platforms/directfb/qdirectfbintegration.h2
2 files changed, 15 insertions, 0 deletions
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index 3d1b79ef38..27d070b75d 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -71,6 +71,19 @@ void QDirectFbIntegration::connectToDirectFb()
initializeInput();
}
+bool QDirectFbIntegration::hasCapability(Capability cap) const
+{
+ switch (cap) {
+ case ThreadedPixmaps: return true;
+ case MultipleWindows: return true;
+#ifdef DIRECTFB_GL_EGL
+ case OpenGL: return true;
+ case ThreadedOpenGL: return true;
+#endif
+ default: return QPlatformIntegration::hasCapability(cap);
+ }
+}
+
void QDirectFbIntegration::initializeDirectFB()
{
const QStringList args = QCoreApplication::arguments();
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.h b/src/plugins/platforms/directfb/qdirectfbintegration.h
index b49600bed9..8586f33587 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.h
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.h
@@ -62,6 +62,7 @@ public:
void connectToDirectFb();
+ bool hasCapability(Capability cap) const;
QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const;
QPlatformWindow *createPlatformWindow(QWindow *window) const;
QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
@@ -80,6 +81,7 @@ protected:
QScopedPointer<QDirectFbInput> m_input;
QScopedPointer<QThread> m_inputRunner;
QScopedPointer<QPlatformFontDatabase> m_fontDb;
+
};
QT_END_NAMESPACE