diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-12 13:59:19 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-12 14:01:46 +0200 |
commit | 73bc91c9dfc66b5cd1a89c75b414c0573bc35c2a (patch) | |
tree | 6bda1e09322e0ff4638783cff8c6bcfb35a173ce /doc | |
parent | 793b7e80083d77b0804a40b5732a8888c9ce5cd8 (diff) | |
parent | 9bde391da4a36a612d38fb0041f5ab2e262741b1 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I9300572e2b74f0564b2589cbd0fbdf24850f68df
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/manifest-meta.qdocconf | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index 516e810c21..f5a4422601 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -39,15 +39,18 @@ manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ "QtQuick/Qt Quick Demo - Tweet Search" \ "QtQuick/Qt Quick Demo - Maroon*" \ "QtQuick/Qt Quick Demo - Calqlatr" \ - "QtQuick/Qt Quick Particles Examples - Emitters" \ + "QtQuick/Qt Quick Demo - StocQt" \ + "QtQuick/Qt Quick Demo - Clocks" \ "QtQuick/Qt Quick Examples - Shader Effects" \ - "QtWebKitExamples/Fancy Browser" \ - "QtWebKitExamples/Flickr View Example" \ - "QtWebKitExamples/YouTube View Example" \ + "QtQuick/Qt Quick Examples - Text" \ + "QtQuick/Qt Quick Examples - Window and Screen" \ "QtQuickControls/Qt Quick Controls - Gallery" \ "QtQuickControls/Qt Quick Controls - Text Editor Example" \ "QtQuickControls/Qt Quick Controls - Table View Example" \ - "QtWidgets/Application Example" + "QtQuickControls/Qt Quick Controls - Calendar Example" \ + "QtQuickDialogs/Qt Quick System Dialog Examples" \ + "QtWidgets/Application Example" \ + "QtWinExtras/Quick Player" manifestmeta.highlighted.attributes = isHighlighted:true |