summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-06 15:03:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-06 15:03:38 (GMT)
commit04f5b7c80917ebbe56f3ceadda517771238f3800 (patch)
tree50a08e10dfdec9b29c6de1d6e08cdfa73bb48875 /src/3rdparty/webkit
parentb79f79399dac8a3e16c7d1a3724965b3e166f46c (diff)
parent08c34bfec8880600138846bb895e82f69cb3f92c (diff)
downloadQt-04f5b7c80917ebbe56f3ceadda517771238f3800.zip
Qt-04f5b7c80917ebbe56f3ceadda517771238f3800.tar.gz
Qt-04f5b7c80917ebbe56f3ceadda517771238f3800.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: Fixed incorrect Symbian scoping. Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2 QPixmaps try to access FBS connection after the connection has been closed.
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 537cdd3..5ea1e77 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -2857,13 +2857,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