summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-09-29 03:48:42 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-10-01 05:29:48 (GMT)
commit75c41435a05b383ca96647ae45df9ceca3fa3852 (patch)
treec5c5b1ea5fc619c15c197d34035616069c45cf6c
parent6fd7f7933f12414979b19e34bad1bf17c4b6e2bf (diff)
downloadQt-75c41435a05b383ca96647ae45df9ceca3fa3852.zip
Qt-75c41435a05b383ca96647ae45df9ceca3fa3852.tar.gz
Qt-75c41435a05b383ca96647ae45df9ceca3fa3852.tar.bz2
Document "import QtQuick 1.0" change
Task-number: QTBUG-13799 (cherry picked from commit 1ab457d5db184c53d9857a7b425051e5aa5ff2e0)
-rw-r--r--doc/src/declarative/declarativeui.qdoc1
-rw-r--r--doc/src/declarative/whatsnew.qdoc55
2 files changed, 56 insertions, 0 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/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.
+*/