aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-02-14 15:01:52 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-15 11:26:28 +0100
commitcf3327cfbe861c0ee33008df20a53949034ac95e (patch)
tree87c8a4c5153a3388fa34e29e60404b66befaa657
parent76d1e5e611d53ad61936100cb47d13be21f3d8be (diff)
Doc: Removed reference to deprecated \badcode command.
QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: Ia0580f7d664ad5e33b48d6511dac7c61349cacce Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc4
-rw-r--r--src/quick/doc/src/concepts/positioning/anchors.qdoc9
-rw-r--r--src/quick/items/qquickrepeater.cpp5
3 files changed, 11 insertions, 7 deletions
diff --git a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
index 31a68d34fa..04b278106f 100644
--- a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
+++ b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
@@ -147,8 +147,8 @@ custom element \c PushButton with a \c buttonText property that internally
reflects the value of a \c m_buttonText member variable. Modifying the member
variable directly like this is not a good idea:
-\badcode
-// BAD!
+\code
+//bad code
QQmlComponent component(engine, "MyButton.qml");
PushButton *button = qobject_cast<PushButton*>(component.create());
button->m_buttonText = "Click me";
diff --git a/src/quick/doc/src/concepts/positioning/anchors.qdoc b/src/quick/doc/src/concepts/positioning/anchors.qdoc
index 871cd526d0..d0a14f7392 100644
--- a/src/quick/doc/src/concepts/positioning/anchors.qdoc
+++ b/src/quick/doc/src/concepts/positioning/anchors.qdoc
@@ -140,7 +140,8 @@ carefully ordered, or they may produce unexpected outcomes. The following exampl
\table
\row
\li
- \badcode
+ \code
+ //bad code
Rectangle {
width: 50
anchors.left: parent.left
@@ -185,7 +186,8 @@ conditional bindings, as this can lead to the ordering issue described above. In
the Rectangle will eventually grow to the full width of its parent, because both left and right anchors
will be simultaneously set during binding update.
-\badcode
+\code
+//bad code
Rectangle {
width: 50; height: 50
anchors.left: state == "right" ? undefined : parent.left;
@@ -201,7 +203,8 @@ ordering issues internally.
For performance reasons, you can only anchor an item to its siblings and direct parent. For example,
the following anchor is invalid and would produce a warning:
-\badcode
+\code
+//bad code
Item {
id: group1
Rectangle { id: rect1; ... }
diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp
index 68f70a5227..4c43b4bf72 100644
--- a/src/quick/items/qquickrepeater.cpp
+++ b/src/quick/items/qquickrepeater.cpp
@@ -116,9 +116,10 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate()
Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects.
For example, it cannot be used to repeat QtObjects:
- \badcode
+ \code
+ //bad code
Item {
- //XXX does not work! Can't repeat QtObject as it doesn't derive from Item.
+ Can't repeat QtObject as it doesn't derive from Item.
Repeater {
model: 10
QtObject {}