diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:48:41 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:48:41 +0100 |
| commit | d0d65c146d79b49473a1270130dd090c80bb1bca (patch) | |
| tree | 08f663be93c2a033aa78011c2f88d5f70e3841c4 | |
| parent | 997de1e600e1dc4a605c2125769dc5484b9787e0 (diff) | |
| parent | 8c38eb80b5e32419dff90137559a0c6ce1cbdfcd (diff) | |
| download | qtdoc-d0d65c146d79b49473a1270130dd090c80bb1bca.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I8403cce6fbe12c859ebed4727c5ea593f3033052
| -rw-r--r-- | doc/src/portingguide.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/userinterfaces.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/portingguide.qdoc b/doc/src/portingguide.qdoc index d94aa2bc..1f8057c0 100644 --- a/doc/src/portingguide.qdoc +++ b/doc/src/portingguide.qdoc @@ -51,7 +51,7 @@ The following list summarizes the changes in Qt 5: \li Widgets - These are now part of a separate module, \l{Qt Widgets}. They were part of \l{Qt GUI} earlier. \li Qt Quick - The older Qt Quick version (1.0) is now part of a separate - \l{http://qt-project.org/doc/qt-4.8/qtdeclarative.html}{Qt Declarative} + \l{http://doc.qt.io/qt-4.8/qtdeclarative-module.html}{Qt Declarative} add-on module for compatibility purposes. We recommend using the new Qt Quick (2.0) from now on to avoid binary breaks in the future. \li Qt3Support - This module is removed in Qt 5, so you must move away from diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc index 480db921..0e98380e 100644 --- a/doc/src/userinterfaces.qdoc +++ b/doc/src/userinterfaces.qdoc @@ -35,7 +35,7 @@ possible to mix and match these different technologies as needed, one approach is often better suitable for a certain type of user interface than the others. \l {Qt Creator Manual}{Qt Creator} is a good example of an application that mixes different user interface technologies. In fact, it uses all of the three different approaches -described below. Qt Creator uses the traditional \l {Qt Widgets} such as +described below. \l {Qt Creator Manual}{Qt Creator} uses the traditional \l {Qt Widgets} such as menus and dialogs as a basis of the user interface, \l {Qt Quick} amongst others for the welcome screen, and \l {Qt WebKit} for presenting the Qt reference documentation. The following sections provide brief introductions to the |