diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-09 02:06:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-09 02:06:56 (GMT) |
| commit | e9822f9ba2576124808227196db238f044eef00b (patch) | |
| tree | 20b7077f874ccba0b06452841d8a3f921b55dfea /doc/src/snippets/code/doc_src_stylesheet.qdoc | |
| parent | 39b2be35eb86dc0bfe94f10dc90933234ed658a6 (diff) | |
| parent | 98e14cd4b62e57609ee67030845a0740d8ba01ab (diff) | |
| download | Qt-e9822f9ba2576124808227196db238f044eef00b.zip Qt-e9822f9ba2576124808227196db238f044eef00b.tar.gz Qt-e9822f9ba2576124808227196db238f044eef00b.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (39 commits)
Give better error message when using unsupported lookbehinds in QRegExp
Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT
Add GL_EXT_texture_format_BGRA8888 support.
Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling
Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr
Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr
Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916
Revert "Correction for effectiveBoundingRect() calculation for QGraphicsItem"
Correction for effectiveBoundingRect() calculation for QGraphicsItem
Correct faulty 4.7->4.8 merge of Symbian def-files
Missing icon in the designer documentation
Fridge magnet example code snippet error
qpaintdevice-qt3.html documentation errors
QWebElement example missed information
QSPlitter style-sheet example was invalid
Errors in QSqlDriver::handle examples
QGLColormap example was invalid
QPointer made no mention of QWeakPointer
Invalid links to http://developer.symbian.org
QNetworkDiskCache documentation missed information
...
Diffstat (limited to 'doc/src/snippets/code/doc_src_stylesheet.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_stylesheet.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc index 99b31c9..78d76a8 100644 --- a/doc/src/snippets/code/doc_src_stylesheet.qdoc +++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc @@ -481,7 +481,7 @@ QTextEdit { background-position: bottom center } //! [81] -QDialog { etch-disabled-text: 1 } +QDialogButtonBox { dialogbuttonbox-buttons-have-icons: 1; } //! [81] @@ -1479,7 +1479,7 @@ QSplitter::handle:vertical { } QSplitter::handle:pressed { - url(images/splitter_pressed.png); + image: url(images/splitter_pressed.png); } //! [142] |