diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-10-15 16:01:41 (GMT) |
|---|---|---|
| committer | Anders Bakken <anders.bakken@nokia.com> | 2009-10-15 16:19:34 (GMT) |
| commit | fd2049b3e318e28a10c18fe344de54820ef9ea40 (patch) | |
| tree | b678f66eb2edf59bee03e598187482b5bc0fe18d /src | |
| parent | 563b9362dbdedadb773ae45d6fa672f2c75463d9 (diff) | |
| download | Qt-fd2049b3e318e28a10c18fe344de54820ef9ea40.zip Qt-fd2049b3e318e28a10c18fe344de54820ef9ea40.tar.gz Qt-fd2049b3e318e28a10c18fe344de54820ef9ea40.tar.bz2 | |
Make QT_DIRECTFB_SUBSURFACE an opt-in option
Previously you had to define QT_NO_DIRECTFB_SUBSURFACE to prevent Qt
from using subsurfaces for locked surfaces. Now make the default be
QT_NO_DIRECTFB_SUBSURFACE and rather allow people to define
QT_DIRECTFB_SUBSURFACE to use this option.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/embedded/directfb.pri | 2 | ||||
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/embedded/directfb.pri b/src/gui/embedded/directfb.pri index fa4dd68..84253b5 100644 --- a/src/gui/embedded/directfb.pri +++ b/src/gui/embedded/directfb.pri @@ -1,7 +1,7 @@ # These defines might be necessary if your DirectFB driver doesn't # support all of the DirectFB API. # -#DEFINES += QT_NO_DIRECTFB_SUBSURFACE +#DEFINES += QT_DIRECTFB_SUBSURFACE #DEFINES += QT_DIRECTFB_WINDOW_AS_CURSOR #DEFINES += QT_NO_DIRECTFB_IMAGEPROVIDER #DEFINES += QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index 437f1ae..0520cdc 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -#if !defined QT_NO_DIRECTFB_SUBSURFACE && !defined QT_DIRECTFB_SUBSURFACE -#define QT_DIRECTFB_SUBSURFACE +#if !defined QT_DIRECTFB_SUBSURFACE && !defined QT_NO_DIRECTFB_SUBSURFACE +#define QT_NO_DIRECTFB_SUBSURFACE #endif #if !defined QT_NO_DIRECTFB_LAYER && !defined QT_DIRECTFB_LAYER #define QT_DIRECTFB_LAYER |