summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsitem.cpp18
-rw-r--r--src/declarative/qml/qmlcomponent.cpp4
-rw-r--r--src/declarative/qml/qmlscript.cpp4
-rw-r--r--src/declarative/qml/qmlscriptstring.cpp4
4 files changed, 17 insertions, 13 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index 263aea5..5b4f1f1 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -168,7 +168,7 @@ QML_DEFINE_TYPE(Qt,4,6,Rotation,QGraphicsRotation)
\qmlproperty real Rotation::axis.z
The axis to rotate around. For simple (2D) rotation around a point, you do not need to specify an axis,
- as the default axis is the z axis (\c{ axis { x: 0; y: 0; z: 0 } }).
+ as the default axis is the z axis (\c{ axis { x: 0; y: 0; z: 1 } }).
For a typical 3D-like rotation you will usually specify both the origin and the axis.
@@ -656,7 +656,7 @@ void QmlGraphicsKeyNavigationAttached::keyReleased(QKeyEvent *event)
focus: true
Keys.onPressed: {
if (event.key == Qt.Key_Left) {
- print("move left");
+ console.log("move left");
event.accepted = true;
}
}
@@ -670,7 +670,7 @@ void QmlGraphicsKeyNavigationAttached::keyReleased(QKeyEvent *event)
\code
Item {
focus: true
- Keys.onLeftPressed: print("move left")
+ Keys.onLeftPressed: console.log("move left")
}
\endcode
@@ -1359,11 +1359,11 @@ QmlGraphicsKeysAttached *QmlGraphicsKeysAttached::qmlAttachedProperties(QObject
focus: true
Keys.onPressed: {
if (event.key == Qt.Key_Left) {
- print("move left");
+ console.log("move left");
event.accepted = true;
}
}
- Keys.onSelectPressed: print("Selected");
+ Keys.onSelectPressed: console.log("Selected");
}
\endqml
@@ -1943,8 +1943,8 @@ void QmlGraphicsItem::setClip(bool c)
Whether the item is visible. By default this is true.
- \note visible is not linked to actual visibility; if you item
- goes off screen, or the opacity changes to 0, etc this will
+ \note visible is not linked to actual visibility; if an item
+ moves off screen, or the opacity changes to 0, this will
not affect the visible property.
*/
@@ -2930,6 +2930,8 @@ bool QmlGraphicsItem::heightValid() const
\qmlproperty bool Item::wantsFocus
This property indicates whether the item has has an active focus request.
+
+ \sa {qmlfocus}{Keyboard Focus}
*/
/*! \internal */
@@ -2942,6 +2944,8 @@ bool QmlGraphicsItem::wantsFocus() const
\qmlproperty bool Item::focus
This property indicates whether the item has keyboard input focus. Set this
property to true to request focus.
+
+ \sa {qmlfocus}{Keyboard Focus}
*/
/*! \internal */
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 7f8836a..5f8b816 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -112,9 +112,9 @@ Item {
\qml
Rectangle {
- Component.onCompleted: print("Completed Running!")
+ Component.onCompleted: console.log("Completed Running!")
Rectangle {
- Component.onCompleted: print("Nested Completed Running!")
+ Component.onCompleted: console.log("Nested Completed Running!")
}
}
\endqml
diff --git a/src/declarative/qml/qmlscript.cpp b/src/declarative/qml/qmlscript.cpp
index eb0b858..ba62898 100644
--- a/src/declarative/qml/qmlscript.cpp
+++ b/src/declarative/qml/qmlscript.cpp
@@ -54,8 +54,8 @@
\qml
Script {
function debugMyComponent() {
- print(text.text);
- print(otherinterestingitem.property);
+ console.log(text.text);
+ console.log(otherinterestingitem.property);
}
}
MouseRegion { onClicked: debugMyComponent() }
diff --git a/src/declarative/qml/qmlscriptstring.cpp b/src/declarative/qml/qmlscriptstring.cpp
index 6f669d5..1ccad53 100644
--- a/src/declarative/qml/qmlscriptstring.cpp
+++ b/src/declarative/qml/qmlscriptstring.cpp
@@ -60,12 +60,12 @@ public:
The QmlScriptString is used by properties that want to accept a script "assignment" from QML.
Normally, the following code would result in a binding being established for the \c script
-property. If the property had a type of QmlScriptString, the script - \e {print(1921)} - itself
+property. If the property had a type of QmlScriptString, the script - \e {console.log(1921)} - itself
would be passed to the property and it could choose how to handle it.
\code
MyType {
- script: print(1921)
+ script: console.log(1921)
}
\endcode
*/