diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /examples/widgets | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/doc/src/echoplugin.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/doc/src/styleplugin.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/doc/src/tooltips.qdoc | 2 | ||||
| -rw-r--r-- | examples/widgets/widgets/mousebuttons/mousebuttons.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/widgets/doc/src/echoplugin.qdoc b/examples/widgets/doc/src/echoplugin.qdoc index 103a51cf93..1e10ac3006 100644 --- a/examples/widgets/doc/src/echoplugin.qdoc +++ b/examples/widgets/doc/src/echoplugin.qdoc @@ -192,7 +192,7 @@ the platform. By convention the target should have the same name as the plugin (set with Q_EXPORT_PLUGIN2) - \section1 Further reading and examples + \section1 Further Reading and Examples The \l {qtplugin-defining-plugins}{Defining Plugins} page presents an overview of the macros needed to create plugins. diff --git a/examples/widgets/doc/src/styleplugin.qdoc b/examples/widgets/doc/src/styleplugin.qdoc index e65ded36a4..2eae6017a5 100644 --- a/examples/widgets/doc/src/styleplugin.qdoc +++ b/examples/widgets/doc/src/styleplugin.qdoc @@ -123,7 +123,7 @@ styles folder under stylewindow because this is a path in which Qt will search for style plugins. - \section1 Related articles and examples + \section1 Related Articles and Examples In addition to the plugin \l{How to Create Qt Plugins}{overview document}, we have other examples and articles that concern diff --git a/examples/widgets/doc/src/tooltips.qdoc b/examples/widgets/doc/src/tooltips.qdoc index bba19aeac7..4212e62b14 100644 --- a/examples/widgets/doc/src/tooltips.qdoc +++ b/examples/widgets/doc/src/tooltips.qdoc @@ -61,7 +61,7 @@ First we will review the \c SortingBox class, then we will take a look at the \c ShapeItem class. - \section1 SortingBox Class Definition + \section1 SortingBox Class Definition \snippet widgets/tooltips/sortingbox.h 0 diff --git a/examples/widgets/widgets/mousebuttons/mousebuttons.pro b/examples/widgets/widgets/mousebuttons/mousebuttons.pro index 99ab9f68ae..e1f4b9527d 100644 --- a/examples/widgets/widgets/mousebuttons/mousebuttons.pro +++ b/examples/widgets/widgets/mousebuttons/mousebuttons.pro @@ -1,6 +1,6 @@ TEMPLATE = app -TARGET = buttontester +TARGET = mousebuttons TEMPLATE = app SOURCES += \ |