diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 19:27:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 19:27:40 (GMT) |
| commit | de20fdfb1da72d2ad89689f46f8412c04c25fc96 (patch) | |
| tree | 357c58a6f082a09ee793bddf7f7c4e18dd02482b /doc/src | |
| parent | ac0de5f1d783a32b4d3d40bf28daa1b252764483 (diff) | |
| parent | 4d1be3f07428651f3e366e4c09f26cff3b52d91f (diff) | |
| download | Qt-de20fdfb1da72d2ad89689f46f8412c04c25fc96.zip Qt-de20fdfb1da72d2ad89689f46f8412c04c25fc96.tar.gz Qt-de20fdfb1da72d2ad89689f46f8412c04c25fc96.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add make stub_sis target, and add webkit stub to qt.iby
Fix to S60 softkeys when no active Qt window or native widget is shown.
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/platforms/symbian-introduction.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc index 5cebee3..591d6f1 100644 --- a/doc/src/platforms/symbian-introduction.qdoc +++ b/doc/src/platforms/symbian-introduction.qdoc @@ -132,6 +132,8 @@ Smart installer will attempt to download missing dependencies in addition to just installing the application. + \row \o \c stub_sis \o Create a stub sis to allow upgradability of projects + that are deployed in ROM \endtable The following lines perform a debug build for the emulator |