diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-06 15:08:45 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-06 15:08:45 (GMT) |
| commit | 6bc6003cb2a2bb770d4e060653f18c05d8f4296b (patch) | |
| tree | 44cddd871e6cac48345a04bb900addf9626b5e8b /tools/qdoc3/test/qt-defines.qdocconf | |
| parent | bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8 (diff) | |
| download | Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.zip Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.tar.gz Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.tar.bz2 | |
Squashed merge of the master-temp branch.
Conflicts:
doc/src/examples/maemovibration.qdoc
Diffstat (limited to 'tools/qdoc3/test/qt-defines.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-defines.qdocconf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf index 50a355f..aaf935a 100644 --- a/tools/qdoc3/test/qt-defines.qdocconf +++ b/tools/qdoc3/test/qt-defines.qdocconf @@ -10,7 +10,8 @@ defines = Q_QDOC \ Q_BYTE_ORDER \ QT_DEPRECATED \ Q_NO_USING_KEYWORD \ - __cplusplus + __cplusplus \ + Q_COMPILER_INITIALIZER_LISTS versionsym = QT_VERSION_STR |