summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-10-28 07:52:30 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-11-10 09:30:30 (GMT)
commitad79d84b8da174ecdd5d0b617504481add81430f (patch)
tree9d963f1f29ad1ee6f0a99ee46cd3e1edc0cc80c5
parent8474d7e594f5b70ca88ef0188969298ed771e875 (diff)
downloadQt-ad79d84b8da174ecdd5d0b617504481add81430f.zip
Qt-ad79d84b8da174ecdd5d0b617504481add81430f.tar.gz
Qt-ad79d84b8da174ecdd5d0b617504481add81430f.tar.bz2
Re-apply change 914d5847532a85a564a5df4a2bc8bdccb0f91abb by Shane Kearns
Re-apply change cadd19cd98b9a6ff7ff8755f7774027400aadb0f by Shane Kearns Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane Kearns 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
-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 60e414f..4e84a80 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -3381,3 +3381,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"
+ }
+ }
+}