diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:36:55 +0200 |
| commit | 98d3e40fb7c88b670a93e73dace2d0f05a5f903c (patch) | |
| tree | b1292124a86c219fb434db4ec28e8f805ff52287 /doc/global | |
| parent | a74e4b85be83e2da47f4a1d8fcf0e78079335b80 (diff) | |
| parent | bab494e4d046f5617d19f5fec35eeff94377c51f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-armv7le-qcc/qplatformdefs.h
src/printsupport/kernel/qcups.cpp
src/widgets/styles/qstyle.h
tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267
Diffstat (limited to 'doc/global')
| -rw-r--r-- | doc/global/config.qdocconf | 2 | ||||
| -rw-r--r-- | doc/global/externalsites/qtcreator.qdoc | 4 | ||||
| -rw-r--r-- | doc/global/includes/examples-run.qdocinc | 5 | ||||
| -rw-r--r-- | doc/global/template/style/offline.css | 2 | ||||
| -rw-r--r-- | doc/global/template/style/online.css | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf index 8629b89e7e..670b13a9ea 100644 --- a/doc/global/config.qdocconf +++ b/doc/global/config.qdocconf @@ -10,3 +10,5 @@ dita.metadata.default.audience = programmer #Set the main Qt index.html navigation.homepage = "Qt $QT_VER" buildversion = "Qt $QT_VERSION Reference Documentation" + +sourcedirs += includes diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index 2edb3769fd..30e65034fc 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -468,8 +468,8 @@ \title Qt Creator: Adding Debuggers */ /*! - \externalpage http://qt-project.org/doc/qtcreator/creator-android-app-tutorial.html - \title Qt Creator: Creating an Android Application + \externalpage http://qt-project.org/doc/qtcreator/creator-mobile-app-tutorial.html + \title Qt Creator: Creating a Mobile Application */ /*! \externalpage http://qt-project.org/doc/qtcreator/creator-diff-editor.html diff --git a/doc/global/includes/examples-run.qdocinc b/doc/global/includes/examples-run.qdocinc new file mode 100644 index 0000000000..e9b8575650 --- /dev/null +++ b/doc/global/includes/examples-run.qdocinc @@ -0,0 +1,5 @@ +\section1 Running the Example + +To run the example from \l{Qt Creator Manual}{Qt Creator}, open the \gui Welcome +mode and select the example from \gui Examples. For more information, visit +\l{Qt Creator: Building and Running an Example}{Building and Running an Example}. diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index bfa086284f..c993a07d47 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -464,7 +464,7 @@ List */ ul { - padding-bottom: 2px + margin-top: 10px; } li { diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index d105a6fd55..0dc01d396b 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -348,7 +348,7 @@ List */ ul { - padding-bottom: 2px + margin-top: 10px; } li { |