summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-10-28 07:52:30 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2009-10-28 07:52:30 (GMT)
commit6bc9ef388590b4bfb281d2e1510dc7c3d1837349 (patch)
tree76536d58762c5f8c5ca6c0553d29c89993529208 /src/3rdparty
parentf80dca1e0f035807e5e6a984aec1768519f4d467 (diff)
downloadQt-6bc9ef388590b4bfb281d2e1510dc7c3d1837349.zip
Qt-6bc9ef388590b4bfb281d2e1510dc7c3d1837349.tar.gz
Qt-6bc9ef388590b4bfb281d2e1510dc7c3d1837349.tar.bz2
Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850
This version of the fix will set the def file only if defblock is enabled in qbase.pri. That means that def files don't get turned on for webkit but not for the whole project (avoids build failures in the continuous integration system when other teams change the exported symbols) Reviewed-by: Jason Barron
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index a835fc7..d633a7a 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -3376,3 +3376,18 @@ CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4
plugins/win/PaintHooks.asm
}
}
+
+# Temporary workaround to pick up the DEF file from the same place as all the others
+symbian {
+ shared {
+ contains(MMP_RULES, defBlock) {
+ MMP_RULES -= defBlock
+
+ MMP_RULES += "$${LITERAL_HASH}ifdef WINSCW" \
+ "DEFFILE ../../../s60installs/bwins/$${TARGET}.def" \
+ "$${LITERAL_HASH}elif defined EABI" \
+ "DEFFILE ../../../s60installs/eabi/$${TARGET}.def" \
+ "$${LITERAL_HASH}endif"
+ }
+ }
+}