summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/declarative')
-rw-r--r--doc/src/declarative/declarativeui.qdoc1
-rw-r--r--doc/src/declarative/modules.qdoc8
-rw-r--r--doc/src/declarative/qdeclarativedebugging.qdoc2
-rw-r--r--doc/src/declarative/qdeclarativedocument.qdoc2
-rw-r--r--doc/src/declarative/qdeclarativei18n.qdoc2
-rw-r--r--doc/src/declarative/qdeclarativeintro.qdoc2
-rw-r--r--doc/src/declarative/qmlruntime.qdoc2
-rw-r--r--doc/src/declarative/qmlviewer.qdoc8
-rw-r--r--doc/src/declarative/qtbinding.qdoc2
-rw-r--r--doc/src/declarative/scope.qdoc10
-rw-r--r--doc/src/declarative/whatsnew.qdoc55
11 files changed, 75 insertions, 19 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index cb326a3..a8df4b1 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -73,6 +73,7 @@ Module.
\section1 Getting Started
\list
+\o \l{What's new in Qt Quick}
\o \l{Introduction to the QML language}
\o \l{QML for Qt Programmers}
\o \l{Getting Started Programming with QML}
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index 467b7d0..044c1e7 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -52,7 +52,7 @@ An \c import statement includes the module name, and possibly a version number.
This can be seen in the snippet commonly found at the top of QML files:
\qml
- import Qt 4.7
+ import QtQuick 1.0
\endqml
This imports version 4.7 of the "Qt" module into the global namespace. (The QML
@@ -126,7 +126,7 @@ application code. When importing an installed module, an un-quoted URI is
used, with a mandatory version number:
\code
- import Qt 4.7
+ import QtQuick 1.0
import com.nokia.qml.mymodule 1.0
\endcode
@@ -181,7 +181,7 @@ By default, when a module is imported, its contents are imported into the global
To import a module into a specific namespace, use the \e as keyword:
\qml
- import Qt 4.7 as QtLibrary
+ import QtQuick 1.0 as QtLibrary
import "../MyComponents" as MyComponents
import com.nokia.qml.mymodule 1.0 as MyModule
\endqml
@@ -199,7 +199,7 @@ Types from these modules can then only be used when qualified by the namespace:
Multiple modules can be imported into the same namespace in the same way that multiple modules can be imported into the global namespace:
\qml
- import Qt 4.7 as Nokia
+ import QtQuick 1.0 as Nokia
import Ovi 1.0 as Nokia
\endqml
diff --git a/doc/src/declarative/qdeclarativedebugging.qdoc b/doc/src/declarative/qdeclarativedebugging.qdoc
index 64c312c..26d3b38 100644
--- a/doc/src/declarative/qdeclarativedebugging.qdoc
+++ b/doc/src/declarative/qdeclarativedebugging.qdoc
@@ -59,7 +59,7 @@ from QML's import loading mechanisms.
For example, for a simple QML file like this:
\qml
-import Qt 4.7
+import QtQuick 1.0
Rectangle { width: 100; height: 100 }
\endqml
diff --git a/doc/src/declarative/qdeclarativedocument.qdoc b/doc/src/declarative/qdeclarativedocument.qdoc
index 8ca6c11..b6af90b 100644
--- a/doc/src/declarative/qdeclarativedocument.qdoc
+++ b/doc/src/declarative/qdeclarativedocument.qdoc
@@ -82,7 +82,7 @@ Each instance is created with a different value for its \c text property:
\o \snippet doc/src/snippets/declarative/qml-documents/qmldocuments.qml document
\o
\qml
-import Qt 4.7
+import QtQuick 1.0
Column {
spacing: 10
diff --git a/doc/src/declarative/qdeclarativei18n.qdoc b/doc/src/declarative/qdeclarativei18n.qdoc
index 70a3587..620b902 100644
--- a/doc/src/declarative/qdeclarativei18n.qdoc
+++ b/doc/src/declarative/qdeclarativei18n.qdoc
@@ -58,7 +58,7 @@ that needs to be translated is enclosed in a call to \c qsTr().
hello.qml:
\qml
-import Qt 4.7
+import QtQuick 1.0
Rectangle {
width: 200; height: 200
diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index fa42f59..9d89edf 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -46,7 +46,7 @@ technologies like HTML and CSS, but it's not required.
QML looks like this:
\code
-import Qt 4.7
+import QtQuick 1.0
Rectangle {
width: 200
diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
index 9a84237..51f9e4d 100644
--- a/doc/src/declarative/qmlruntime.qdoc
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -60,7 +60,7 @@ QDeclarativeView is a QWidget-based class that is able to load QML files.
For example, if there is a QML file, \c application.qml, like this:
\qml
- import Qt 4.7
+ import QtQuick 1.0
Rectangle { width: 100; height: 100; color: "red" }
\endqml
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index 41c4c80..81ad218 100644
--- a/doc/src/declarative/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -118,7 +118,7 @@ For example, this QML document refers to a \c lottoNumbers property which does
not actually exist within the document:
\qml
-import Qt 4.7
+import QtQuick 1.0
ListView {
width: 200; height: 300
@@ -131,7 +131,7 @@ If within the document's directory, there is a "dummydata" directory which
contains a \c lottoNumbers.qml file like this:
\qml
-import Qt 4.7
+import QtQuick 1.0
ListModel {
ListElement { number: 23 }
@@ -146,7 +146,7 @@ Child properties are included when loaded from dummy data. The following documen
refers to a \c clock.time property:
\qml
-import Qt 4.7
+import QtQuick 1.0
Text { text: clock.time }
\endqml
@@ -154,7 +154,7 @@ The text value could be filled by a \c dummydata/clock.qml file with a \c time
property in the root context:
\qml
-import Qt 4.7
+import QtQuick 1.0
QtObject { property int time: 54321 }
\endqml
diff --git a/doc/src/declarative/qtbinding.qdoc b/doc/src/declarative/qtbinding.qdoc
index 6eade18..35a05d2 100644
--- a/doc/src/declarative/qtbinding.qdoc
+++ b/doc/src/declarative/qtbinding.qdoc
@@ -188,7 +188,7 @@ is to have a "running" property in \c main.qml. This leads to much nicer QML co
\o
\code
// main.qml
-import Qt 4.7
+import QtQuick 1.0
Rectangle {
MouseArea {
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc
index 363ba8d..5501242 100644
--- a/doc/src/declarative/scope.qdoc
+++ b/doc/src/declarative/scope.qdoc
@@ -112,7 +112,7 @@ following example shows a simple QML file that accesses some enumeration
values and calls an imported JavaScript function.
\code
-import Qt 4.7
+import QtQuick 1.0
import "code.js" as Code
ListView {
@@ -253,7 +253,7 @@ is used, the \c title property may resolve differently.
\code
// TitlePage.qml
-import Qt 4.7
+import QtQuick 1.0
Item {
property string title
@@ -269,7 +269,7 @@ Item {
}
// TitleText.qml
-import Qt 4.7
+import QtQuick 1.0
Text {
property int size
text: "<b>" + title + "</b>"
@@ -285,7 +285,7 @@ to use property interfaces, like this:
\code
// TitlePage.qml
-import Qt 4.7
+import QtQuick 1.0
Item {
id: root
property string title
@@ -304,7 +304,7 @@ Item {
}
// TitleText.qml
-import Qt 4.7
+import QtQuick 1.0
Text {
property string title
property int size
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
new file mode 100644
index 0000000..f8d1d0e
--- /dev/null
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\title What's new in Qt Quick
+\page qtquick-whatsnew.html
+
+\section1 4.7.1
+
+\section2 QtQuick namespace
+
+In prior Qt releases, all the Qt Quick elements were available in the \e Qt namespace.
+Starting with Qt 4.7.1, the elements are also available in the \e QtQuick namespace,
+which improves naming consistency, and allows the development of Qt Quick to occur at
+a faster rate than Qt's usual minor release schedule.
+
+The change for developers is very simple - where you previously wrote \e {import Qt 4.7},
+just replace it with \e {import QtQuick 1.0}, like this:
+
+\code
+import QtQuick 1.0
+
+Text {
+ text: "Welcome to QtQuick 1.0!"
+}
+\endcode
+
+\e {import Qt 4.7} continues to work so existing applications wont break even if they
+aren't updated, but it is recommended that all import statements be modified to the new
+form.
+*/