diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 01:06:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 01:06:53 (GMT) |
| commit | b9907e309885b4b8ce280c721231a56a583b51d0 (patch) | |
| tree | c00dc724328822994a9bc9ec4197c0d6323b2dd3 /src/plugins | |
| parent | c0179a6f640a3a88550656884d0bb5065e6b048a (diff) | |
| parent | 84ef315a9ff6014056d7b6313cf9b1f8bdf06cdc (diff) | |
| download | Qt-b9907e309885b4b8ce280c721231a56a583b51d0.zip Qt-b9907e309885b4b8ce280c721231a56a583b51d0.tar.gz Qt-b9907e309885b4b8ce280c721231a56a583b51d0.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."
Export a function to get dfb-surface from a pixmap
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 11 |
1 files changed, 11 insertions, 0 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 |