summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/doc_src_stylesheet.qdoc
diff options
context:
space:
mode:
authorWater-Team <water@pad.test.qt.nokia.com>2011-11-03 00:00:12 (GMT)
committerWater-Team <water@pad.test.qt.nokia.com>2011-11-03 00:00:12 (GMT)
commitbec28a4fa4dd33dea6ad7520c358211df435f624 (patch)
tree07535434b6a860487f5d2d01371de60904c88a3a /doc/src/snippets/code/doc_src_stylesheet.qdoc
parent8e9eb859d1876ca4133199a60b605bee6a43697c (diff)
parentc9d4611092e780c0cf386bd119d548398798b50a (diff)
downloadQt-bec28a4fa4dd33dea6ad7520c358211df435f624.zip
Qt-bec28a4fa4dd33dea6ad7520c358211df435f624.tar.gz
Qt-bec28a4fa4dd33dea6ad7520c358211df435f624.tar.bz2
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'doc/src/snippets/code/doc_src_stylesheet.qdoc')
-rw-r--r--doc/src/snippets/code/doc_src_stylesheet.qdoc4
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]