diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-08-22 00:11:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 02:04:39 +0200 |
| commit | c374f4441ab42d1849431bb42fec91a976a8e502 (patch) | |
| tree | 0733146c5df48b91a39097730c445dbe9cd2359a /doc | |
| parent | 85b24bb2dea97c3a9b013bacd5a422b26fe5d14b (diff) | |
| parent | c8ca300e491c186304d0864a9e870337e891e6f7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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" \ |