diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-26 09:45:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-26 09:45:55 +0200 |
| commit | 08585f02dc0eb8dc5567f47c55915540c0a34e01 (patch) | |
| tree | d509ccc2e90e13620ef423cb099262cd88919c0a /examples | |
| parent | 55145c52677e961804b7b3a725652bd5ce1e0269 (diff) | |
| parent | 4c231d5df3040dbf4545a9a77145ee0e1f9c380c (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/doc/orientation.qdoc | 1 | ||||
| -rw-r--r-- | examples/widgets/doc/src/applicationicon.qdoc | 1 | ||||
| -rw-r--r-- | examples/widgets/doc/src/echoplugin.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/doc/src/elidedlabel.qdoc | 1 | ||||
| -rw-r--r-- | examples/widgets/doc/src/syntaxhighlighter.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/tools/tools.pro | 7 |
6 files changed, 3 insertions, 11 deletions
diff --git a/examples/widgets/doc/orientation.qdoc b/examples/widgets/doc/orientation.qdoc index c224f42e4b..df84595885 100644 --- a/examples/widgets/doc/orientation.qdoc +++ b/examples/widgets/doc/orientation.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! \example widgets/orientation - \group all-examples \title Orientation Example \brief The example shows a simple way to use different UIs depending on the screen diff --git a/examples/widgets/doc/src/applicationicon.qdoc b/examples/widgets/doc/src/applicationicon.qdoc index 3c01c34a66..8f9e133e9c 100644 --- a/examples/widgets/doc/src/applicationicon.qdoc +++ b/examples/widgets/doc/src/applicationicon.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! \example widgets/applicationicon - \group all-examples \title Application Icon Example \brief The example shows how to add an application icon to a mobile application. diff --git a/examples/widgets/doc/src/echoplugin.qdoc b/examples/widgets/doc/src/echoplugin.qdoc index 7b7aa9b868..2c56a2f53b 100644 --- a/examples/widgets/doc/src/echoplugin.qdoc +++ b/examples/widgets/doc/src/echoplugin.qdoc @@ -28,7 +28,7 @@ /*! \example tools/echoplugin \title Echo Plugin Example - \group examples-widgets-tools + \ingroup examples-widgets-tools \brief This example shows how to create a Qt plugin. diff --git a/examples/widgets/doc/src/elidedlabel.qdoc b/examples/widgets/doc/src/elidedlabel.qdoc index 8020c0aa56..5a4d384de8 100644 --- a/examples/widgets/doc/src/elidedlabel.qdoc +++ b/examples/widgets/doc/src/elidedlabel.qdoc @@ -27,7 +27,6 @@ /*! \example widgets/elidedlabel - \group all-examples \title Elided Label Example \brief This example creates a widget similar to QLabel, that elides the last diff --git a/examples/widgets/doc/src/syntaxhighlighter.qdoc b/examples/widgets/doc/src/syntaxhighlighter.qdoc index 3ebfcad380..6c343a47fb 100644 --- a/examples/widgets/doc/src/syntaxhighlighter.qdoc +++ b/examples/widgets/doc/src/syntaxhighlighter.qdoc @@ -28,7 +28,7 @@ /*! \example richtext/syntaxhighlighter \title Syntax Highlighter Example - \group examples-richtext + \ingroup examples-richtext \brief The Syntax Highligher example shows how to perform simple syntax highlighing. diff --git a/examples/widgets/tools/tools.pro b/examples/widgets/tools/tools.pro index f08f7fd6d2..7178411110 100644 --- a/examples/widgets/tools/tools.pro +++ b/examples/widgets/tools/tools.pro @@ -5,8 +5,8 @@ SUBDIRS = \ customcompleter \ echoplugin \ i18n \ - plugandpaint \ plugandpaintplugins \ + plugandpaint \ regexp \ settingseditor \ styleplugin \ @@ -17,8 +17,3 @@ SUBDIRS = \ contains(DEFINES, QT_NO_TRANSLATION): SUBDIRS -= i18n plugandpaint.depends = plugandpaintplugins - -# install -sources.files = tools.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tools -INSTALLS += sources |