diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-27 14:17:16 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-27 14:17:16 (GMT) |
| commit | abfee117ec2dd5ad5be3b1c497a12f884b28568d (patch) | |
| tree | bdb9d7f9beb9215558b4d826e597fc8d7f265943 /src/3rdparty/webkit/WebCore | |
| parent | dbb127c226f131fabe39d9ce89ace5d3e6f7deb9 (diff) | |
| parent | 8135af2cebdaaccefb95f0be149328077d237a89 (diff) | |
| download | Qt-abfee117ec2dd5ad5be3b1c497a12f884b28568d.zip Qt-abfee117ec2dd5ad5be3b1c497a12f884b28568d.tar.gz Qt-abfee117ec2dd5ad5be3b1c497a12f884b28568d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -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 |