summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-04-08 03:21:11 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-04-08 04:20:12 (GMT)
commit4e86f05efe32275117f686d6ae3b39eb0a7621af (patch)
tree0ce2179a35daf304e5f3679e73a5a5b9cecd3000 /doc/src/declarative
parent76f5e9e7d1eea8d688d5459b7b7b2bfa3f9057ed (diff)
downloadQt-4e86f05efe32275117f686d6ae3b39eb0a7621af.zip
Qt-4e86f05efe32275117f686d6ae3b39eb0a7621af.tar.gz
Qt-4e86f05efe32275117f686d6ae3b39eb0a7621af.tar.bz2
Replace "import Qt 4.6" with "import Qt 4.7"
Diffstat (limited to 'doc/src/declarative')
-rw-r--r--doc/src/declarative/dynamicobjects.qdoc2
-rw-r--r--doc/src/declarative/globalobject.qdoc2
-rw-r--r--doc/src/declarative/modules.qdoc4
-rw-r--r--doc/src/declarative/qdeclarativedocument.qdoc8
-rw-r--r--doc/src/declarative/qdeclarativei18n.qdoc2
-rw-r--r--doc/src/declarative/qtbinding.qdoc10
-rw-r--r--doc/src/declarative/scope.qdoc10
7 files changed, 19 insertions, 19 deletions
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index b2e3f90..63f697d 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -122,7 +122,7 @@ If the QML does not exist until runtime, you can create a QML item from
a string of QML using the createQmlObject function, as in the following example:
\code
- newObject = createQmlObject('import Qt 4.6; Rectangle { color: "red"; width: 20; height: 20 }',
+ newObject = createQmlObject('import Qt 4.7; Rectangle { color: "red"; width: 20; height: 20 }',
targetItem, "dynamicSnippet1");
\endcode
The first argument is the string of QML to create. Just like in a new file, you will need to
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 231e75a..71ab67d 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -266,7 +266,7 @@ of their use.
Example (where targetItem is the id of an existing QML item):
\code
- newObject = createQmlObject('import Qt 4.6; Rectangle {color: "red"; width: 20; height: 20}',
+ newObject = createQmlObject('import Qt 4.7; Rectangle {color: "red"; width: 20; height: 20}',
targetItem, "dynamicSnippet1");
\endcode
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index d476d6f..68e58fb 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -150,7 +150,7 @@ types to be referenced, or purely for readability.
To import a module into a namespace:
\code
-import Qt 4.6 as TheQtLibrary
+import Qt 4.7 as TheQtLibrary
\endcode
Types from Qt 4.6 may then be used, but only by qualifying them with the namespace:
@@ -163,7 +163,7 @@ Multiple modules can be imported into the same namespace in the same way that mu
modules can be imported into the global namespace:
\code
-import Qt 4.6 as Nokia
+import Qt 4.7 as Nokia
import Ovi 1.0 as Nokia
\endcode
diff --git a/doc/src/declarative/qdeclarativedocument.qdoc b/doc/src/declarative/qdeclarativedocument.qdoc
index a210c98..bf95a29 100644
--- a/doc/src/declarative/qdeclarativedocument.qdoc
+++ b/doc/src/declarative/qdeclarativedocument.qdoc
@@ -49,7 +49,7 @@ stored on a disk or network resource, but can also be constructed directly from
Here is a simple QML document:
\code
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 240; height: 320;
@@ -103,7 +103,7 @@ instantiated four times, each with a different value for its \c text property.
<table><tr><td>
\endraw
\code
-import Qt 4.6
+import Qt 4.7
BorderImage {
property alias text: textElement.text
@@ -152,7 +152,7 @@ These final two examples are behaviorally identical to the original document.
\row
\o
\code
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 240; height: 320;
@@ -170,7 +170,7 @@ Rectangle {
\endcode
\o
\code
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 240; height: 320;
diff --git a/doc/src/declarative/qdeclarativei18n.qdoc b/doc/src/declarative/qdeclarativei18n.qdoc
index 598c567..0a48dd9 100644
--- a/doc/src/declarative/qdeclarativei18n.qdoc
+++ b/doc/src/declarative/qdeclarativei18n.qdoc
@@ -72,7 +72,7 @@ that needs to be translated is enclosed in a call to \c qsTr().
hello.qml:
\qml
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 200; height: 200
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index 577e69a..181c504 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -108,7 +108,7 @@ QObject *window = component.create(windowContext);
\o
\code
// main.qml
-import Qt 4.6
+import Qt 4.7
Rectangle {
color: backgroundColor
@@ -198,7 +198,7 @@ the window text will update accordingly.
\code
// main.qml
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 240
@@ -287,7 +287,7 @@ int main(int argc, char **argv)
\o
\code
// main.qml
-import Qt 4.6
+import Qt 4.7
Rectangle {
MouseArea {
@@ -311,7 +311,7 @@ is to have a "running" property. This leads to much nicer QML code:
\o
\code
// main.qml
-import Qt 4.6
+import Qt 4.7
Rectangle {
MouseArea {
@@ -390,7 +390,7 @@ MyApplication::MyApplication()
\endcode
\code
// main.qml
-import Qt 4.6
+import Qt 4.7
Image {
source: "images/background.png"
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc
index 964f7d5..65553cf 100644
--- a/doc/src/declarative/scope.qdoc
+++ b/doc/src/declarative/scope.qdoc
@@ -126,7 +126,7 @@ following example shows a simple QML file that accesses some enumeration
values and calls an imported JavaScript function.
\code
-import Qt 4.6
+import Qt 4.7
import "code.js" as Code
ListView {
@@ -267,7 +267,7 @@ is used, the \c title property may resolve differently.
\code
// TitlePage.qml
-import Qt 4.6
+import Qt 4.7
Item {
property string title
@@ -283,7 +283,7 @@ Item {
}
// TitleText.qml
-import Qt 4.6
+import Qt 4.7
Text {
property int size
text: "<b>" + title + "</b>"
@@ -299,7 +299,7 @@ to use property interfaces, like this:
\code
// TitlePage.qml
-import Qt 4.6
+import Qt 4.7
Item {
id: root
property string title
@@ -318,7 +318,7 @@ Item {
}
// TitleText.qml
-import Qt 4.6
+import Qt 4.7
Text {
property string title
property int size