diff options
| author | Anders Bakken <agbakken@gmail.com> | 2010-09-17 15:56:34 (GMT) |
|---|---|---|
| committer | Donald Carr <donald.carr@nokia.com> | 2010-09-17 15:56:34 (GMT) |
| commit | fa373ee165b32b712690656a5f69f862292a2c1e (patch) | |
| tree | c19cf1695c1ffb8580ec2a411b88c090bf19f071 | |
| parent | 0f6dbb14ede58ebe86c1042dab5a0f086635770f (diff) | |
| download | Qt-fa373ee165b32b712690656a5f69f862292a2c1e.zip Qt-fa373ee165b32b712690656a5f69f862292a2c1e.tar.gz Qt-fa373ee165b32b712690656a5f69f862292a2c1e.tar.bz2 | |
Export qt_directfb_.* functions in plugin as well
These functions can be a big help in debugging rendering errors in an
application and can even be handy to use for real functionality. While
it requires the app to explicitly link to the plugin (when compiling
with -plugin-gfx-directfb this is still much better than not exporting
them).
Since this was the only use-case for QT_DIRECTFB_PLUGIN it's probably
better to take that define out.
Merge-request: 2470
Reviewed-by: Donald Carr <donald.carr@nokia.com>
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/directfb.pro | 2 | ||||
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/gfxdrivers/directfb/directfb.pro b/src/plugins/gfxdrivers/directfb/directfb.pro index 0706f01..d397050 100644 --- a/src/plugins/gfxdrivers/directfb/directfb.pro +++ b/src/plugins/gfxdrivers/directfb/directfb.pro @@ -11,5 +11,5 @@ SOURCES += qdirectfbscreenplugin.cpp QMAKE_CXXFLAGS += $$QT_CFLAGS_DIRECTFB LIBS += $$QT_LIBS_DIRECTFB -DEFINES += $$QT_DEFINES_DIRECTFB QT_DIRECTFB_PLUGIN +DEFINES += $$QT_DEFINES_DIRECTFB contains(gfx-plugins, directfb):DEFINES += QT_QWS_DIRECTFB diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index f704432..c0d96d7 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -585,7 +585,6 @@ 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(); @@ -594,7 +593,6 @@ Q_GUI_EXPORT IDirectFBSurface *qt_directfb_surface_for_pixmap(const QPixmap &pix const QDirectFBPixmapData *dfbData = static_cast<const QDirectFBPixmapData*>(data); return dfbData->directFBSurface(); } -#endif QT_END_NAMESPACE diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index cffd4e3..bf6164d 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -1790,7 +1790,6 @@ IDirectFBSurface *QDirectFBScreen::subSurfaceForWidget(const QWidget *widget, co } #endif -#ifndef QT_DIRECTFB_PLUGIN Q_GUI_EXPORT IDirectFBSurface *qt_directfb_surface_for_widget(const QWidget *widget, QRect *rect) { return QDirectFBScreen::instance() ? QDirectFBScreen::instance()->surfaceForWidget(widget, rect) : 0; @@ -1808,7 +1807,6 @@ Q_GUI_EXPORT IDirectFBWindow *qt_directfb_window_for_widget(const QWidget *widge } #endif -#endif QT_END_NAMESPACE |