summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2009-08-25 21:37:59 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-08-25 21:37:59 (GMT)
commit1470504e15662acf37bacc58359527f88efc43ab (patch)
tree60253cdcad052326346c362ed5fb943a59e5fa37 /src
parenta5f41541caea7f19d5259a48e2de8db8144e3373 (diff)
downloadQt-1470504e15662acf37bacc58359527f88efc43ab.zip
Qt-1470504e15662acf37bacc58359527f88efc43ab.tar.gz
Qt-1470504e15662acf37bacc58359527f88efc43ab.tar.bz2
Make IDirectFBImageProvider enabled by default
To prevent using IDirectFBImageProviders one can define QT_NO_DIRECTFB_IMAGEPROVIDER Reviewed-by: Donald Carr <donald.carr@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/gfxdrivers/directfb/directfb.pro2
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbscreen.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/gfxdrivers/directfb/directfb.pro b/src/plugins/gfxdrivers/directfb/directfb.pro
index 5876df1..c5da3df 100644
--- a/src/plugins/gfxdrivers/directfb/directfb.pro
+++ b/src/plugins/gfxdrivers/directfb/directfb.pro
@@ -7,7 +7,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers
# support all of the DirectFB API.
#
#DEFINES += QT_DIRECTFB_WINDOW_AS_CURSOR
-#DEFINES += QT_DIRECTFB_IMAGEPROVIDER
+#DEFINES += QT_NO_DIRECTFB_IMAGEPROVIDER
#DEFINES += QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE
#DEFINES += QT_DIRECTFB_IMAGECACHE
#DEFINES += QT_NO_DIRECTFB_WM
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
index 7768380..8ec91c7 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
@@ -59,8 +59,8 @@ QT_MODULE(Gui)
#if !defined QT_DIRECTFB_IMAGECACHE && !defined QT_NO_DIRECTFB_IMAGECACHE
#define QT_NO_DIRECTFB_IMAGECACHE
#endif
-#if !defined QT_DIRECTFB_IMAGEPROVIDER && !defined QT_NO_DIRECTFB_IMAGEPROVIDER
-#define QT_NO_DIRECTFB_IMAGEPROVIDER
+#if !defined QT_DIRECTFB_NO_IMAGEPROVIDER && !defined QT_DIRECTFB_IMAGEPROVIDER
+#define QT_DIRECTFB_IMAGEPROVIDER
#endif
#if !defined QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE && !defined QT_NO_DIRECTFB_IMAGEPROVIDER_KEEPALIVE
#define QT_NO_DIRECTFB_IMAGEPROVIDER_KEEPALIVE