diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 21:38:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 21:38:31 (GMT) |
| commit | 587b0fed9bd17a378eb0212c95074df965549ef2 (patch) | |
| tree | ad5071ee13c83804c782646433d32f5e002af245 /src | |
| parent | b4afd4e4cabce0347e155803afd8ff1a7b90f080 (diff) | |
| parent | 05f4d51a69516aa585f9941960afd483325e562f (diff) | |
| download | Qt-587b0fed9bd17a378eb0212c95074df965549ef2.zip Qt-587b0fed9bd17a378eb0212c95074df965549ef2.tar.gz Qt-587b0fed9bd17a378eb0212c95074df965549ef2.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 deployment paths for WebKit declarative plugin.
Fix s60main linking issue with gcce applications
Fixed deployment paths for the symbian/linux-armcc mkspec.
Fixed a relative path problem in qml demos.
Added the APP_PRIVATE_DIR_BASE variable.
Various fixes to autotests when using the symbian/linux-armcc mkspec.
Fixed Symbian resources not honoring TARGET with a path.
Removed useless comments.
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 | ||||
| -rw-r--r-- | src/s60main/s60main.pro | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 1162a52..c1661a4 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -26,7 +26,7 @@ symbian: { webkitbackup.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,) contains(QT_CONFIG, declarative) { - declarativeImport.sources = qmlwebkitplugin$${QT_LIBINFIX}.dll + declarativeImport.sources = $$QT_BUILD_TREE/imports/QtWebKit/qmlwebkitplugin$${QT_LIBINFIX}.dll declarativeImport.sources += ../WebKit/qt/declarative/qmldir declarativeImport.path = c:$$QT_IMPORTS_BASE_DIR/QtWebKit DEPLOYMENT += declarativeImport diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro index 1ba105d..9ea3080 100644 --- a/src/s60main/s60main.pro +++ b/src/s60main/s60main.pro @@ -25,6 +25,10 @@ symbian { # Workaround for abld toolchain problem to make ARMV6 qtmain.lib link with GCCE apps symbian-abld: QMAKE_CXXFLAGS.ARMCC += --dllimport_runtime + + # Having MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA will cause s60main.lib be unlinkable + # against GCCE apps, so remove it + MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA } else { error("$$_FILE_ is intended only for Symbian!") } |