diff options
| author | Iain <qt-info@nokia.com> | 2009-10-23 13:43:28 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-10-23 13:47:28 (GMT) |
| commit | 3b7f570e6f296ef0a5c9c581ed06cb19986164a0 (patch) | |
| tree | 84037a0acf406467685810179d3c24feeb1d2fe4 | |
| parent | 94adcc5022d6d8e9278c569203a9d0be12e36cc1 (diff) | |
| download | Qt-3b7f570e6f296ef0a5c9c581ed06cb19986164a0.zip Qt-3b7f570e6f296ef0a5c9c581ed06cb19986164a0.tar.gz Qt-3b7f570e6f296ef0a5c9c581ed06cb19986164a0.tar.bz2 | |
Revert "Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by Iain"
This reverts commit f4abf627a8d097e095022d2709718a681b54bd7e.
DEF file was unconditionally enabled for Webkit, ignoring setting in
qtbase.pri, which was supposed to be the global place to enable/disable
DEF file usage. Remove this workaround since we still haven't got
DEF files switched on by default.
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index f321aad..a835fc7 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -87,19 +87,6 @@ win32-g++ { QMAKE_LIBDIR_POST += $$split(TMPPATH,";") } -# Temporary workaround to pick up the DEF file from the same place as all the others -symbian { - shared { - 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" - } -} - # Assume that symbian OS always comes with sqlite symbian:!CONFIG(QTDIR_build): CONFIG += system-sqlite |