aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-27 12:59:04 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-27 12:59:04 +0200
commita1922317f8b2c219176553ff3f0db815f6f16cfd (patch)
treef90b3725afcfdd5efce59ad698bd1b347f26900e /src/qml/doc
parent02bf3ca59ea1aa4af0ce39d2f4fc856ce47f9966 (diff)
parentffe861a0785056a90c787172400fa6061acfcc32 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/qml/doc')
-rw-r--r--src/qml/doc/src/whatsnew.qdoc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc
index eece3bcaab..f1c69160b6 100644
--- a/src/qml/doc/src/whatsnew.qdoc
+++ b/src/qml/doc/src/whatsnew.qdoc
@@ -37,6 +37,11 @@ a summary of the new changes:
\li New QQmlApplicationEngine convenience class for QML applications.
\li New Instantiatior type for generic, dynamic object creation.
\li New properties for \l Qt.application: arguments, name, and version.
+\li The 'with' statement has been deprecated and is slated for removal in a
+ future version of the language.
+\li New \l Qt.platform object with an os property
+\li New \l qmlClearTypeRegistations() function drops all data from qmlRegisterType calls
+\li New \l qmlRegisterType function for registering composite types.
\endlist
\section2 New Submodule