diff options
| author | Alan Alpert <aalpert@rim.com> | 2012-12-11 14:17:24 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-12 15:46:50 +0100 |
| commit | 5b0e3eab3cabd1b3f4edc8f71b67fc21e4130ce9 (patch) | |
| tree | 404b88e61cde70d984cb936d1434227b34da031d | |
| parent | 4338bd8c6ed93ca13ccbb0bfbdda44f6c71ecccb (diff) | |
| download | qtdoc-5b0e3eab3cabd1b3f4edc8f71b67fc21e4130ce9.tar.gz | |
Resolve "Porting QML Applications to Qt 5" name conflict
QtQuick docs also contain a page which should be called "Porting QML
Applications to Qt 5". As that page contains the complete list of
changes which may affect porting, it should have the more generic name.
The page in qtdoc has been rename "Porting QML Applications to Qt 5
Example" as it is a worked example of porting flickr.
Task-number: QTBUG-28411
Change-Id: I2b883a2bfa0abc3a978289a31013aa55e913bce1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| -rw-r--r-- | doc/src/portingcppapps_toqt5.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/portingguide.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/portingqmlapp.qdoc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/portingcppapps_toqt5.qdoc b/doc/src/portingcppapps_toqt5.qdoc index ac96720b..82a21355 100644 --- a/doc/src/portingcppapps_toqt5.qdoc +++ b/doc/src/portingcppapps_toqt5.qdoc @@ -49,7 +49,7 @@ This creates the \c animatedtiles executable. Try running the executable to see \section1 Related topics \list \li \l {API Changes} -\li \l {Porting QML Applications to Qt 5} +\li \l {Porting QML Applications to Qt 5 Example} \li \l {QML Examples and Demos} \endlist */ diff --git a/doc/src/portingguide.qdoc b/doc/src/portingguide.qdoc index d2c316ca..65d9bffe 100644 --- a/doc/src/portingguide.qdoc +++ b/doc/src/portingguide.qdoc @@ -62,7 +62,7 @@ The following list summarizes the changes in Qt 5: \list \li \l {C++ API Changes} \li \l {Porting C++ Applications to Qt 5} -\li \l {QML Applications in Qt 5} \li \l {Porting QML Applications to Qt 5} +\li \l {Porting QML Applications to Qt 5 Example} \endlist */ diff --git a/doc/src/portingqmlapp.qdoc b/doc/src/portingqmlapp.qdoc index ba2adb7b..7a1ea236 100644 --- a/doc/src/portingqmlapp.qdoc +++ b/doc/src/portingqmlapp.qdoc @@ -26,12 +26,12 @@ ****************************************************************************/ /*! \page portingqmlapp.html -\title Porting QML Applications to Qt 5 +\title Porting QML Applications to Qt 5 Example \brief Provides step-by-step instructions to port a QML application to Qt 5. The new version of Qt Quick in Qt 5 brings in some changes to the way QML applications are developed. For the complete list of changes that affect -existing QML applications, refer to \l{QML Applications in Qt 5}. +existing QML applications, refer to \l{Porting QML Applications to Qt 5}. This topic will walk through the porting process to make the \c{flickr} Qt 4 QML demo work on Qt 5. If you have the SDK based on Qt 4.8 installed, you can @@ -90,5 +90,5 @@ snapshot of the application running on Ubuntu v12.04: \image flickr_application.png \section1 Related Topics -\l{QML Applications in Qt 5} +\l{Porting QML Applications to Qt 5} */ |