summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-04-14 04:20:16 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-04-14 04:24:01 (GMT)
commitc94c7e6609f117a277862992d13e2ef35bafccd9 (patch)
treee0eadb87f2d45b020c86f4b2334c73d9f6b334d8 /src
parentfad51dfe05476ee1b7b800181dd544ac004de145 (diff)
downloadQt-c94c7e6609f117a277862992d13e2ef35bafccd9.zip
Qt-c94c7e6609f117a277862992d13e2ef35bafccd9.tar.gz
Qt-c94c7e6609f117a277862992d13e2ef35bafccd9.tar.bz2
Rename remaining import Qt 4.6 lines to import Qt 4.7
Task-number: Reviewed-by: Martin Jones
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qdeclarativesmoothedfollow.cpp2
-rw-r--r--src/imports/multimedia/qdeclarativeaudio.cpp2
-rw-r--r--src/imports/multimedia/qdeclarativevideo.cpp2
-rw-r--r--src/imports/particles/qdeclarativeparticles.cpp2
-rw-r--r--src/multimedia/effects/qsoundeffect.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/util/qdeclarativesmoothedfollow.cpp b/src/declarative/util/qdeclarativesmoothedfollow.cpp
index 63c9618..9f155fc 100644
--- a/src/declarative/util/qdeclarativesmoothedfollow.cpp
+++ b/src/declarative/util/qdeclarativesmoothedfollow.cpp
@@ -86,7 +86,7 @@ public:
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"
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 8d2dc61..82d5d89 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
This element is part of the \bold{Qt.multimedia 4.7} module.
\qml
- import Qt 4.6
+ import Qt 4.7
import Qt.multimedia 4.7
Audio { source: "audio/song.mp3" }
diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp
index bf112be..c6ae272 100644
--- a/src/imports/multimedia/qdeclarativevideo.cpp
+++ b/src/imports/multimedia/qdeclarativevideo.cpp
@@ -76,7 +76,7 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString)
This element is part of the \bold{Qt.multimedia 4.7} module.
\qml
- import Qt 4.6
+ import Qt 4.7
import Qt.multimedia 4.7
Video { source: "video/movie.mpg" }
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index ad6a512..d17a8a1 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -644,7 +644,7 @@ void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int ag
snow, the lower one has particles expelled up like a fountain.
\qml
-import Qt 4.6
+import Qt 4.7
import Qt.labs.particles 1.0
Rectangle {
diff --git a/src/multimedia/effects/qsoundeffect.cpp b/src/multimedia/effects/qsoundeffect.cpp
index 8a38103..d34e532 100644
--- a/src/multimedia/effects/qsoundeffect.cpp
+++ b/src/multimedia/effects/qsoundeffect.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
The following example plays a wav file on mouse click.
\qml
- import Qt 4.6
+ import Qt 4.7
import Qt.multimedia 4.7
Item {