diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 18:14:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 18:14:08 (GMT) |
| commit | fc007d0a99cc52e673c5d2606e5076831f6103b1 (patch) | |
| tree | 5ad98ad0fa614b9becf21f2419adb633666028c9 /src/3rdparty | |
| parent | f4ee70e849759adc710a56cf25e08a32b8250ebd (diff) | |
| parent | acc84a9d0d3427155298db3a8c0ad406d078de0e (diff) | |
| download | Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.zip Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.tar.gz Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Check S60_VERSION instead of existence of certain files in bearer plugin
Fixed EPOCROOT references in createpackage.pl.
Restore 4.7.0 behavior that non-existing paths are possible.
QTBUG-4852 Turning on runtime nested exception support where available
Fix warnings
Fixed incorrect Symbian scoping.
QS60style: itemview selection indication works incorrectly
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 87638a0..5f688f3 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2860,13 +2860,13 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) { } } -!symbian { +!symbian-abld:!symbian-sbsv2 { modfile.files = $$moduleFile modfile.path = $$[QMAKE_MKSPECS]/modules INSTALLS += modfile } else { - # INSTALLS is not implemented in qmake's s60 generators, copy headers manually + # INSTALLS is not implemented in qmake's mmp generators, copy headers manually inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} inst_modfile.input = moduleFile |