summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-02-12 14:11:15 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-02-12 14:11:15 +0100
commit41e685d02ff7c881b90970f6fd8b6c7a2a2831c7 (patch)
treef4a3048c58be17b546f620ac22a1cdcd5035490e /examples
parent70a8761f6c059d18169b6565886dc9159dabebd3 (diff)
parentb21d397336d52d034ab6db699c26bf3918fe81e6 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'examples')
-rw-r--r--examples/activeqt/menus/doc/src/menus.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/activeqt/menus/doc/src/menus.qdoc b/examples/activeqt/menus/doc/src/menus.qdoc
index e9ce374..49a37bc 100644
--- a/examples/activeqt/menus/doc/src/menus.qdoc
+++ b/examples/activeqt/menus/doc/src/menus.qdoc
@@ -31,7 +31,7 @@
\title Menubar Merging
- This example is not full functional at the moment.
+ This example is not fully functional at the moment.
\raw HTML
<object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd"