summaryrefslogtreecommitdiffstats
path: root/src
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 /src
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 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp2
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp2
-rw-r--r--src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp2
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp2
-rw-r--r--src/declarative/qml/qdeclarativeworkerscript.cpp2
-rw-r--r--src/declarative/util/qdeclarativepropertychanges.cpp2
-rw-r--r--src/declarative/util/qdeclarativesmoothedanimation.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
index c846431..f5beebd 100644
--- a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
@@ -108,7 +108,7 @@ public:
Example:
\code
- import Qt 4.6
+ import Qt 4.7
import MyApp 2.1 as Widgets
Rectangle{
id: rect
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 29e43f9..4b311af 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -449,7 +449,7 @@ void QDeclarativeTextInput::setFocusOnPress(bool b)
input of integers between 11 and 31 into the text input:
\code
- import Qt 4.6
+ import Qt 4.7
TextInput{
validator: IntValidator{bottom: 11; top: 31;}
focus: true
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index dfd9c0c..15348ed 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -830,7 +830,7 @@ void QDeclarativeVisualDataModel::setDelegate(QDeclarativeComponent *delegate)
\code
// view.qml
- import Qt 4.6
+ import Qt 4.7
ListView {
width: 200
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 44437ea..ee0bd18 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -408,7 +408,7 @@ QDeclarativeWorkerScriptEngine *QDeclarativeEnginePrivate::getWorkerScriptEngine
\code
QDeclarativeEngine engine;
QDeclarativeComponent component(&engine);
- component.setData("import Qt 4.6\nText { text: \"Hello world!\" }", QUrl());
+ component.setData("import Qt 4.7\nText { text: \"Hello world!\" }", QUrl());
QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(component.create());
//add item to view, etc
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index ddb0ece..caf680e 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -508,7 +508,7 @@ void QDeclarativeWorkerScriptEngine::run()
Here is an example:
\qml
- import Qt 4.6
+ import Qt 4.7
Rectangle {
width: 300
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 0ed97bf..ecbd71e 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE
natural width (which is the whole string on one line).
\qml
- import Qt 4.6
+ import Qt 4.7
Rectangle {
width: 640
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index 3411642..a30e577 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -270,7 +270,7 @@ void QSmoothedAnimation::init()
The follow example shows one rectangle tracking the position of another.
\code
-import Qt 4.6
+import Qt 4.7
Rectangle {
width: 800; height: 600; color: "blue"