diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:43:25 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:43:25 +0100 |
commit | 05808fb8b011c760a2af6dd520b781447db4a0ba (patch) | |
tree | 2319d622b05c7ff70e2e3874ace5ecd0aec75531 /examples | |
parent | 307cd0ed678b37395f02bfb11fd58f8d000da6af (diff) | |
parent | 450651e8155bbdec44253a9c282ec385257b2f8a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47
Diffstat (limited to 'examples')
-rw-r--r-- | examples/activeqt/simple/doc/src/simple.qdoc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/activeqt/simple/doc/src/simple.qdoc b/examples/activeqt/simple/doc/src/simple.qdoc index dbfc0bd..76ac4ea 100644 --- a/examples/activeqt/simple/doc/src/simple.qdoc +++ b/examples/activeqt/simple/doc/src/simple.qdoc @@ -74,6 +74,9 @@ \example activeqt/simple \title Simple Example (ActiveQt) + \brief The Simple example demonstrates the use + of QAxBindable and QAxFactory. + The Simple example demonstrates the use of QAxBindable::requestPropertyChange() and QAxBindable::propertyChanged(), and the use of QAxFactory through the \c QAXFACTORY_BEGIN(), |