diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-06 14:21:16 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-07 13:07:25 +0100 |
commit | a1fe728fa5bd6cb9e50cf317a58efcf4eea4de2c (patch) | |
tree | 0798ae897d111147238544826c79243b6f9a48a4 /doc/global/manifest-meta.qdocconf | |
parent | 57fe9bd2c6a361cf979d17d962abed5db17a1457 (diff) | |
parent | 65bd80ebfc1be81a196a861ade40ff874a3554f0 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
src/plugins/platforms/android/androidjnimain.cpp
src/plugins/platforms/android/qandroidplatformintegration.cpp
src/plugins/platforms/android/qandroidplatformintegration.h
src/plugins/platforms/android/qandroidplatformopenglcontext.cpp
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/sql/doc/src/sql-driver.qdoc
src/widgets/widgets/qtoolbararealayout.cpp
Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
Diffstat (limited to 'doc/global/manifest-meta.qdocconf')
-rw-r--r-- | doc/global/manifest-meta.qdocconf | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index fb0f5c200b..516e810c21 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -77,12 +77,9 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \ "QtWidgets/Stickman Example" \ "QtWidgets/Move Blocks Example" \ "QtWidgets/Border Layout Example" \ - "QtWidgets/Dynamic Layouts Example" \ "QtWidgets/Flow Layout Example" \ - "QtWidgets/MDI Example" \ "QtWidgets/Dock Widgets Example" \ "QtWidgets/Recent Files Example" \ - "QtWidgets/Menus Example" \ "QtWidgets/Concentric Circles Example" \ "QtWidgets/Gradients" \ "QtWidgets/Font Sampler Example" \ @@ -90,38 +87,23 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \ "QtWidgets/Transformations Example" \ "QtWidgets/Syntax Highlighter Example" \ "QtWidgets/Calendar Example" \ - "QtWidgets/Movie Example" \ - "QtWidgets/Validators Example" \ "QtWidgets/Analog Clock Example" \ "QtWidgets/Calculator Example" \ "QtWidgets/Mouse Button Tester" \ "QtWidgets/Character Map Example" \ - "QtWidgets/Wiggly Example" \ "QtWidgets/Digital Clock Example" \ "QtWidgets/Elided Label Example" \ - "QtWidgets/Image Viewer Example" \ "QtWidgets/Sliders Example" \ "QtWidgets/Tetrix Example" \ "QtWidgets/Group Box Example" \ - "QtWidgets/Spin Boxes Example" \ "QtWidgets/Undo Framework" \ - "QtWidgets/Regular Expressions Example" \ "QtWidgets/Colliding Mice Example" \ - "QtWidgets/Basic Graphics Layouts Example" \ - "QtWidgets/40000 Chips" \ "QtWidgets/Diagram Scene Example" \ - "QtWidgets/Drag and Drop Robot Example" \ "QtWidgets/Elastic Nodes Example" \ - "QtWidgets/Pad Navigator Example" \ - "QtWidgets/Anchor Layout Example" \ "QtWidgets/Weather Anchor Layout Example" \ - "QtConcurrent/Image Scaling Example" \ - "QtConcurrent/QtConcurrent Progress Dialog Example" \ "QtNetwork/Torrent Example" \ "QtNetwork/Network Chat Example" \ "QtSQL/Master Detail Example" \ - "QtOpenGL/Cube OpenGL ES 2.0 example" \ - "QtOpenGL/Textures Example" \ "QtLinguist/Arrow Pad Example" \ "QtGui/Raster Window Example" \ "QtGui/Analog Clock Window Example" \ @@ -129,12 +111,16 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \ "QtMultimedia/QML Video Shader Effects Example" \ "QtMultimedia/QML Video Example" \ "QtMultimedia/QML Camera Example" \ - "QtMultimedia/Audio Output Example" \ "QtSVG/Text Object Example" \ "QtQML/Qt Quick Examples - XMLHttpRequest" \ "QtQuick/Qt Quick Particles Examples - *" \ "QtQuick/Qt Quick Examples - Touch Interaction" \ - "QtQuick/Scene Graph - *" \ + "QtQuick/Scene Graph - Custom Geometry" \ + "QtQuick/Scene Graph - Graph" \ + "QtQuick/Scene Graph - OpenGL Under QML" \ + "QtQuick/Scene Graph - Painted Item" \ + "QtQuick/Scene Graph - Rendering FBOs" \ + "QtQuick/Scene Graph - Simple Material" \ "QtQuick/Qt Quick Examples - Image Elements" \ "QtQuick/Qt Quick Examples - Key Interaction" \ "QtQuick/Qt Quick Examples - Text" \ @@ -147,21 +133,15 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \ "QtWidgets/Interview" \ "QtWidgets/Spreadsheet" \ "QtWidgets/Pixelator Example" \ - "QtWidgets/Class Wizard Example" \ "QtWidgets/Animated Tiles Example" \ - "QtWidgets/Basic Layouts Example" \ - "QtWidgets/Application Example" \ "QtWidgets/Affine Transformations" \ "QtWidgets/Image Composition Example" \ "QtWidgets/Basic Drawing Example" \ "QtWidgets/Vector Deformation" \ "QtWidgets/Painter Paths Example" \ - "QtWidgets/Text Edit" \ "QtWidgets/Style Sheet Example" \ "QtWidgets/Code Editor Example" \ - "QtWidgets/Window Flags Example" \ "QtWidgets/Scribble Example" \ - "QtWidgets/Shaped Clock Example" \ "QtWidgets/Line Edits Example" \ "QtWidgets/Calendar Widget Example" \ "QtWidgets/Completer Example" \ @@ -169,8 +149,7 @@ manifestmeta.android.names = "QtQuick/Qt Quick Demo - Maroon*" \ "QtQML/Extending QML - Grouped Properties Example" \ "QtQML/Extending QML - Methods Example" \ "QtQML/Extending QML - Signal Support Example" \ - "QtQML/Extending QML - Attached Properties Example" \ - "QtWidgets/Address Book Example" + "QtQML/Extending QML - Attached Properties Example" manifestmeta.android.tags = android |