diff options
| author | Bill King <bking@trolltech.com> | 2010-02-16 05:52:44 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-02-16 05:52:44 (GMT) |
| commit | 3598150df228148c49aa5212ee42bd56c3690032 (patch) | |
| tree | 6d52a578a355e963b05b5a52a6205c270b0f9085 /src/plugins | |
| parent | df27c6e5db83e41ace52e2cebca140a956e9e240 (diff) | |
| parent | 7687b9dd937d8824ef8cbd69385ebe5b81b3885d (diff) | |
| download | Qt-3598150df228148c49aa5212ee42bd56c3690032.zip Qt-3598150df228148c49aa5212ee42bd56c3690032.tar.gz Qt-3598150df228148c49aa5212ee42bd56c3690032.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/qpluginbase.pri | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index f27440e..ba50329 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -593,6 +593,17 @@ void QDirectFBPixmapData::invalidate() imageFormat = QImage::Format_Invalid; } +#ifndef QT_DIRECTFB_PLUGIN +Q_GUI_EXPORT IDirectFBSurface *qt_directfb_surface_for_pixmap(const QPixmap &pixmap) +{ + const QPixmapData *data = pixmap.pixmapData(); + if (!data || data->classId() != QPixmapData::DirectFBClass) + return 0; + const QDirectFBPixmapData *dfbData = static_cast<const QDirectFBPixmapData*>(data); + return dfbData->directFBSurface(); +} +#endif + QT_END_NAMESPACE #endif // QT_NO_QWS_DIRECTFB diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri index 3af8b40..3fd3657 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -1,6 +1,6 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.6.2 + VERSION=4.6.3 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } |