summaryrefslogtreecommitdiffstats
path: root/src/gui/embedded
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2009-08-31 20:30:45 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-09-01 18:26:14 (GMT)
commitd6c197aa263ba7e98d29376fee95ec10125b8cf2 (patch)
treee9d204406f6e1e9f84d6bc7749d122695993acb7 /src/gui/embedded
parent5bbb30442772898a9af04a8986416e6d66cf1311 (diff)
downloadQt-d6c197aa263ba7e98d29376fee95ec10125b8cf2.zip
Qt-d6c197aa263ba7e98d29376fee95ec10125b8cf2.tar.gz
Qt-d6c197aa263ba7e98d29376fee95ec10125b8cf2.tar.bz2
Add DirectFB to QScreenDriverFactory
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Diffstat (limited to 'src/gui/embedded')
-rw-r--r--src/gui/embedded/qscreendriverfactory_qws.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/embedded/qscreendriverfactory_qws.cpp b/src/gui/embedded/qscreendriverfactory_qws.cpp
index 21058af..99ee8f2 100644
--- a/src/gui/embedded/qscreendriverfactory_qws.cpp
+++ b/src/gui/embedded/qscreendriverfactory_qws.cpp
@@ -51,7 +51,9 @@
#include <stdlib.h>
#include "private/qfactoryloader_p.h"
#include "qscreendriverplugin_qws.h"
-
+#ifndef QT_NO_QWS_DIRECTFB
+#include "qdirectfbscreen.h"
+#endif
#ifndef QT_NO_QWS_VNC
#include "qscreenvnc_qws.h"
#endif
@@ -118,6 +120,10 @@ QScreen *QScreenDriverFactory::create(const QString& key, int displayId)
if (driver == QLatin1String("linuxfb") || driver.isEmpty())
return new QLinuxFbScreen(displayId);
#endif
+#ifndef QT_NO_QWS_DIRECTFB
+ if (driver == QLatin1String("directfb") || driver.isEmpty())
+ return new QDirectFBScreen(displayId);
+#endif
#ifndef QT_NO_QWS_TRANSFORMED
if (driver == QLatin1String("transformed"))
return new QTransformedScreen(displayId);
@@ -130,7 +136,6 @@ QScreen *QScreenDriverFactory::create(const QString& key, int displayId)
if (driver == QLatin1String("multi"))
return new QMultiScreen(displayId);
#endif
-
#if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL)
#ifndef QT_NO_LIBRARY