diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-11 07:05:17 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-11 07:05:17 (GMT) |
| commit | feb1351592b55b2a97db737b91f301b69f42cdc9 (patch) | |
| tree | 8cdbb3f72ff1a45300c4d098324daa6ea9d7cbe9 /doc/src/snippets/code | |
| parent | ebefcd1c0d4286a58bea2b4859d471df07f1f013 (diff) | |
| parent | 02df785c9d95cdafe47a087d29a25f08bfb9e387 (diff) | |
| download | Qt-feb1351592b55b2a97db737b91f301b69f42cdc9.zip Qt-feb1351592b55b2a97db737b91f301b69f42cdc9.tar.gz Qt-feb1351592b55b2a97db737b91f301b69f42cdc9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.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] |