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 /tests/auto/qtranslator/qtranslator.pro | |
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 'tests/auto/qtranslator/qtranslator.pro')
-rw-r--r-- | tests/auto/qtranslator/qtranslator.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qtranslator/qtranslator.pro b/tests/auto/qtranslator/qtranslator.pro index 2b08b4a..5b742f7 100644 --- a/tests/auto/qtranslator/qtranslator.pro +++ b/tests/auto/qtranslator/qtranslator.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qtranslator.cpp RESOURCES += qtranslator.qrc -wince*|symbian*: { +wince*|symbian: { addFiles.sources = hellotr_la.qm msgfmt_from_po.qm addFiles.path = . DEPLOYMENT += addFiles |