diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 21:53:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 21:53:22 (GMT) |
| commit | f9ca0df998a8a3a942816f2954603ad996210d8d (patch) | |
| tree | 2310a77cf20d10609603c04f7d1bf29e9aec8042 /qmake/generators | |
| parent | 4c1f54097a1fb1acff817ba8caa8af347ae56cd2 (diff) | |
| parent | 0a5bcc8a0ab57becc36b140954b7034b3d11efbc (diff) | |
| download | Qt-f9ca0df998a8a3a942816f2954603ad996210d8d.zip Qt-f9ca0df998a8a3a942816f2954603ad996210d8d.tar.gz Qt-f9ca0df998a8a3a942816f2954603ad996210d8d.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Use AudioConverter when not preferred format.
Handle values passed to setNotifyInterval more robustly.
Make sure to check for a valid audioformat before open.
Implement symbian^3 e32atomics API
Fix runonphone target due to changed name of sis files
Fix fromSymbian*() image conversion functions.
Fixed cleartype text rendering on translucent surfaces.
Make QColorDialog usable on small screens
Added exit softkey to Wiggly example
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index b84f0f1..76ff7fe 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1988,7 +1988,7 @@ void SymbianMakefileGenerator::generateExecutionTargets(QTextStream& t, const QS t << "\t-call " << epocRoot() << "epoc32/release/winscw/udeb/" << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; } t << "runonphone: sis" << endl; - t << "\trunonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis " << fixedTarget << "_$(QT_SIS_TARGET).sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; + t << "\trunonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis " << fixedTarget << ".sis " << fixedTarget << ".exe " << "$(QT_RUN_OPTIONS)" << endl; t << endl; } } |