diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 08:25:54 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 08:25:54 (GMT) |
| commit | 1051e9d0dc5cbad27b89756839f3619cae2d44fe (patch) | |
| tree | cd25969458735e14c0b5de365760c3fd7747659d /src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp | |
| parent | 0d411622521a89c04a416e2aaf3da44b6015b183 (diff) | |
| parent | 8f1596ae9b64870c54958611552c71b0b390038f (diff) | |
| download | Qt-1051e9d0dc5cbad27b89756839f3619cae2d44fe.zip Qt-1051e9d0dc5cbad27b89756839f3619cae2d44fe.tar.gz Qt-1051e9d0dc5cbad27b89756839f3619cae2d44fe.tar.bz2 | |
Merge branch '4.6' of git:qt/qt into 4.6
Diffstat (limited to 'src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp index 4caee414..05fe70f 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp @@ -43,6 +43,7 @@ #include <QtGui/qscreendriverplugin_qws.h> #include <QtCore/qstringlist.h> +#ifndef QT_NO_QWS_DIRECTFB class DirectFBScreenDriverPlugin : public QScreenDriverPlugin { @@ -73,3 +74,5 @@ QScreen* DirectFBScreenDriverPlugin::create(const QString& driver, } Q_EXPORT_PLUGIN2(qdirectfbscreen, DirectFBScreenDriverPlugin) + +#endif |