diff options
author | David Boddie <david.boddie@nokia.com> | 2010-12-21 14:08:58 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-12-21 14:08:58 (GMT) |
commit | 8a795bb375d50efd99daa3135d6f7079b83278e9 (patch) | |
tree | 5381e60cbe5caedbbec811a1aed5429bfb9bb9c6 /tools/qdoc3/test/qt-defines.qdocconf | |
parent | 6e8ee41d64fe0dfa86995402954b2cbfede48d21 (diff) | |
parent | 9862f29b3c8d3f23113388b48b1c4b86523137dc (diff) | |
download | Qt-8a795bb375d50efd99daa3135d6f7079b83278e9.zip Qt-8a795bb375d50efd99daa3135d6f7079b83278e9.tar.gz Qt-8a795bb375d50efd99daa3135d6f7079b83278e9.tar.bz2 |
Merge branch 'qdoc-simplified' into 4.7
Diffstat (limited to 'tools/qdoc3/test/qt-defines.qdocconf')
-rw-r--r-- | tools/qdoc3/test/qt-defines.qdocconf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf index bf7fd08..50a355f 100644 --- a/tools/qdoc3/test/qt-defines.qdocconf +++ b/tools/qdoc3/test/qt-defines.qdocconf @@ -3,12 +3,12 @@ defines = Q_QDOC \ QT_.*_LIB \ QT_COMPAT \ QT_KEYPAD_NAVIGATION \ - QT_NO_EGL \ + QT_NO_EGL \ QT3_SUPPORT \ Q_WS_.* \ Q_OS_.* \ Q_BYTE_ORDER \ - QT_DEPRECATED \ + QT_DEPRECATED \ Q_NO_USING_KEYWORD \ __cplusplus |