Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

2 files changed, 12 insertions, 2 deletions

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index ff38ac6..8d8e6c6 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -90,7 +90,7 @@ Qt applications.
 
 \list
 \o \l{Debugging QML}
-\o \l{Developing Qt Quick Applications with Creator}{Developing with Qt Creator}
+\o \l{external: Developing Qt Quick Applications with Creator}{Developing with Qt Creator}
 \o \l{QML Viewer}
 \endlist
 
@@ -102,7 +102,7 @@ Qt applications.
 \o \l{Qt Declarative Module}
 \o \l{QML Basic Types}{QML Data Types}
 \o \l{QML Coding Conventions}
-\o \l{Qt Creator Manual}
+\o \l{external: Qt Creator Manual}{Qt Creator Manual}
 \o \l{Programming with Qt}
 \o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/index.html}{Qt Mobility Documentation}
 \endlist
@@ -140,4 +140,9 @@ examples for porting}
 \o \l{QML Best Practices: Coding Conventions}{Coding Tips}
 \o \l{QML Performance}{Performance Tips}
 \endlist
+
+\section1 License Information
+\list
+\o \l{Qt Quick Licensing Information}
+\endlist
 */
diff --git a/doc/src/declarative/qtquick-intro.qdoc b/doc/src/declarative/qtquick-intro.qdoc
index 02b2c44..75236e6 100644
--- a/doc/src/declarative/qtquick-intro.qdoc
+++ b/doc/src/declarative/qtquick-intro.qdoc
@@ -113,6 +113,11 @@ The \l {Qt Quick} page has links to various Qt Quick topics such as QML
 features, addons, and tools.
 
 The \l {QML Examples and Demos} page has a gallery of QML applications.
+
+\section1 License Information
+\list
+\o \l{Qt Quick Licensing Information}
+\endlist
 */