summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <aalpert@rim.com>2012-12-08 12:20:35 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-12 16:50:17 +0100
commitce97fe0fc482f2fda72583544e3436508f73417e (patch)
treeaa08b35860dfeaf1c46b71cd64bf5d188b7a3912
parent3cc8625a64cd6e9c0503307fd31087a4d1626bcf (diff)
Update porting docsv5.0.0-rc2
Some improvements to the QML engine in Qt 5 lead to behavior changes. These should be explained in the porting guide. Task-number: QTBUG-28411 Change-Id: Ifc4016cf7b33ba113dbe0cbabd2f71a4ff1a8685 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Bea Lam <bea.lam@jollamobile.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-rw-r--r--src/quick/doc/src/appdevguide/porting.qdoc11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/quick/doc/src/appdevguide/porting.qdoc b/src/quick/doc/src/appdevguide/porting.qdoc
index 6bb2a75074..305524c9e6 100644
--- a/src/quick/doc/src/appdevguide/porting.qdoc
+++ b/src/quick/doc/src/appdevguide/porting.qdoc
@@ -27,7 +27,7 @@
/*!
\page qtquick-porting-qt5.html
-\title QML Applications in Qt 5
+\title Porting QML Applications to Qt 5
\brief Lists the Qt 5.0 changes that affect the existing QML applications
When porting QML-related code from Qt 4.8 to Qt 5, application developers should be aware that
@@ -38,6 +38,15 @@ This article describes the changes that affect your existing code. If you are
interested in the summary of all new features in Qt 5 for QML application development, see
\l{qtqml-releasenotes.html}{QtQml Release Notes} and \l{qtquick-releasenotes.html}{QtQuick Release Notes}.
+\section1 QML Language changes
+
+There are very few changes in the QML language which affect the porting of existing Qt 4.8 QML code to Qt 5. These are:
+
+\list
+\li Individual file imports no longer work (e.g. import "MyType.qml"). Import the containing directory instead.
+\li Relative file paths in JavaScript files are now resolved relative to the location of the JavaScript file instead of the QML file that imported it.
+\endlist
+
\section1 QtQuick Module
The QtQuick module has been updated to version 2.0. All QML applications should update their import