summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAnders Bakken <anders@trolltech.com>2009-03-25 18:17:57 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2009-05-05 21:58:24 (GMT)
commitf06d186c3b9b053132d8107f843317067238083f (patch)
tree433f9bc7b244a23a050e4f7c87a1144b4d46fdba /configure
parent0208f6419556af968bb0bbe1d1cdedede1819e67 (diff)
downloadQt-f06d186c3b9b053132d8107f843317067238083f.zip
Qt-f06d186c3b9b053132d8107f843317067238083f.tar.gz
Qt-f06d186c3b9b053132d8107f843317067238083f.tar.bz2
Make sure image caching works with Qt3Support
Store whether qt was built with qt3support enabled in .qmake.cache. We need this info to decide if QT3_SUPPORT should be defined when we include qimage_p.h. Otherwise we get data corruption issues since the size of struct in Qt is larger than the one we include in libqdirectfb. Reviewed-by: Donald <qt-info@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure b/configure
index 24e755e..20bf457 100755
--- a/configure
+++ b/configure
@@ -5160,6 +5160,9 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
QMakeVar set QT_CFLAGS_DIRECTFB "$QT_CFLAGS_DIRECTFB"
QMakeVar set QT_LIBS_DIRECTFB "$QT_LIBS_DIRECTFB"
fi
+ if [ "$CFG_QT3SUPPORT" = "yes" ]; then
+ QMakeVar set QT_DEFINES_DIRECTFB "QT3_SUPPORT"
+ fi
if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/directfb "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DIRECTFB $QT_LIBS_DIRECTFB; then
echo "The DirectFB screen driver functionality test failed!"