diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 10:38:57 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 11:03:18 +0200 |
commit | c8ca300e491c186304d0864a9e870337e891e6f7 (patch) | |
tree | f1d991c5960b5acc0bf2a709960e871d48d91acf /doc | |
parent | 31c96d34d27f8cad020238df28c10a71b2c4a34f (diff) | |
parent | 8b540f68a8404e4b9e3ac65a22c11416a91ee749 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/src.pro
Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/externalsites/qt-webpages.qdoc | 5 | ||||
-rw-r--r-- | doc/global/manifest-meta.qdocconf | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index 1bb6228ed1..e94aee0980 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -105,3 +105,8 @@ \externalpage http://qt-project.org/wiki/Qt-Localization \title external: Translating Qt Into Other Languages */ + +/*! + \externalpage http://qt-project.org/wiki/BlackBerry + \title Qt for BlackBerry +*/ diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index ccf3622be9..6b55e0dbad 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -108,7 +108,6 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \ "QtWidgets/Regular Expressions Example" \ "QtWidgets/Colliding Mice Example" \ "QtWidgets/Basic Graphics Layouts Example" \ - "QtWidgets/Boxes" \ "QtWidgets/40000 Chips" \ "QtWidgets/Diagram Scene Example" \ "QtWidgets/Drag and Drop Robot Example" \ |