diff options
author | Iain <qt-info@nokia.com> | 2009-09-11 09:49:23 (GMT) |
---|---|---|
committer | Iain <qt-info@nokia.com> | 2009-09-11 09:49:23 (GMT) |
commit | 04fc98f2ed323c71a8671542f4f37faa988c434f (patch) | |
tree | 11a5dc618d6dfc27d8aafe3bf3a28981325a7304 /doc/src/snippets/code | |
parent | 3d4a2cd013f9e62788adf902a57ae8e2f31fccc7 (diff) | |
parent | 92789fabd6728820b244d23d7477f2a224a33f94 (diff) | |
download | Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.zip Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.tar.gz Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r-- | doc/src/snippets/code/doc_src_installation.qdoc | 5 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_stylesheet.qdoc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index 412cee3..68765ec 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -204,3 +204,8 @@ make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<cer cd embedded\fluidlauncher make sis QT_SIS_OPTIONS=-i //! [30] + +//! [31] +cd \Qt\%VERSION% +configure -platform win32-g++ -xplatform symbian-sbsv2 +//! [31] diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc index 9f5d989..f79f7ff 100644 --- a/doc/src/snippets/code/doc_src_stylesheet.qdoc +++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc @@ -421,9 +421,6 @@ QSpinBox::down-button { height: 10px } //! [59] /* implicitly sets the size of down-button to the size of spindown.png */ QSpinBox::down-button { image: url(:/images/spindown.png) } - -QTextEdit { image: url(x1.png) url(x2.png) } -QTextEdit { image: url(pic1.svg) } //! [59] |