diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-01 02:09:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-01 02:09:51 (GMT) |
| commit | 5ffd23421660aa41dd982f130b347051aff5c238 (patch) | |
| tree | a85e54e16358a5c9c6565369b554ceb8aa54b821 /doc/src/snippets/code | |
| parent | 74b6123b41192fc7cfcfdea862e28a382f90e7d9 (diff) | |
| parent | a99b6221f5296f97bfa29e0560943634ccc30c3f (diff) | |
| download | Qt-5ffd23421660aa41dd982f130b347051aff5c238.zip Qt-5ffd23421660aa41dd982f130b347051aff5c238.tar.gz Qt-5ffd23421660aa41dd982f130b347051aff5c238.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (142 commits)
fix autotest on windows (again)
fix autotest on windows
Prevent stroking zero length lines in qstroker.cpp
Make the animation driver private API
Always prepend drive letter to $$EPOCROOT in Windows Symbian builds
Add files deployed using qmake_emulator_deployment.flm to 'what' list
Ammend last INTEGRITY fix
Stop using XLFD as fontconfig matching fallback
OpenGL Framebuffer Format
QRuntimeWindowSystem: Track window size properly
Fix qmake build on Windows
Fix QTBUG-17627: build break in mobility bearer applications
Add the missing image for doc of QNetworkSession.
Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
Fix QPlainTextEdit corruption/crash with scrolling
Add expected failures for JSC-specific bugs
fix test for QtLighthouse
Check engine existence before increasing reference count
Make autotest insensitive to exact JS error wording
Fix typo in autotest
...
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index cf204b5..5aaa2b0 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -328,9 +328,10 @@ runonphone -s myapp.sis myapp.exe //! [49] //! [50] -nokia_plugin/openc/s60opencsis/openc_ssl_s60_1_6_ss.sis -nokia_plugin/openc/s60opencsis/pips_s60_1_6_ss.sis -nokia_plugin/opencpp/s60opencppsis/stdcpp_s60_1_6_ss.sis +src/s60installs/sqlite3.sis +$EPOCROOT/nokia_plugin/openc/s60opencsis/openc_ssl_s60_1_6_ss.sis +$EPOCROOT/nokia_plugin/openc/s60opencsis/pips_s60_1_6_ss.sis +$EPOCROOT/nokia_plugin/opencpp/s60opencppsis/stdcpp_s60_1_6_ss.sis //! [50] |