diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
| commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
| tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /src/corelib/doc/src/objectmodel | |
| parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
| parent | 281121697340084f7d385eab530f41916789b94d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'src/corelib/doc/src/objectmodel')
| -rw-r--r-- | src/corelib/doc/src/objectmodel/metaobjects.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/objectmodel/properties.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/doc/src/objectmodel/metaobjects.qdoc b/src/corelib/doc/src/objectmodel/metaobjects.qdoc index a482c5cc8b..52c134c517 100644 --- a/src/corelib/doc/src/objectmodel/metaobjects.qdoc +++ b/src/corelib/doc/src/objectmodel/metaobjects.qdoc @@ -32,7 +32,7 @@ \ingroup qt-basic-concepts \keyword meta-object - \target Meta-Object System + \keyword Meta-Object System Qt's meta-object system provides the signals and slots mechanism for inter-object communication, run-time type information, and the dynamic diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc index 55622dd56b..28be328e3a 100644 --- a/src/corelib/doc/src/objectmodel/properties.qdoc +++ b/src/corelib/doc/src/objectmodel/properties.qdoc @@ -31,7 +31,7 @@ \brief An overview of Qt's property system. \ingroup qt-basic-concepts - \target Qt's Property System + \keyword Qt's Property System Qt provides a sophisticated property system similar to the ones supplied by some compiler vendors. However, as a compiler- and |