summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-12-21 14:08:58 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-12-21 14:08:58 (GMT)
commit8a795bb375d50efd99daa3135d6f7079b83278e9 (patch)
tree5381e60cbe5caedbbec811a1aed5429bfb9bb9c6 /tools
parent6e8ee41d64fe0dfa86995402954b2cbfede48d21 (diff)
parent9862f29b3c8d3f23113388b48b1c4b86523137dc (diff)
downloadQt-8a795bb375d50efd99daa3135d6f7079b83278e9.zip
Qt-8a795bb375d50efd99daa3135d6f7079b83278e9.tar.gz
Qt-8a795bb375d50efd99daa3135d6f7079b83278e9.tar.bz2
Merge branch 'qdoc-simplified' into 4.7
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/test/compat.qdocconf8
-rw-r--r--tools/qdoc3/test/qt-cpp-ignore.qdocconf10
-rw-r--r--tools/qdoc3/test/qt-defines.qdocconf4
-rw-r--r--tools/qdoc3/test/qt-project.qdocconf8
4 files changed, 15 insertions, 15 deletions
diff --git a/tools/qdoc3/test/compat.qdocconf b/tools/qdoc3/test/compat.qdocconf
index 5745ed9..0b59629 100644
--- a/tools/qdoc3/test/compat.qdocconf
+++ b/tools/qdoc3/test/compat.qdocconf
@@ -1,5 +1,5 @@
-alias.i = e
-alias.include = input
+alias.i = e
+alias.include = input
macro.0 = "\\\\0"
macro.b = "\\\\b"
@@ -27,5 +27,5 @@ macro.img = "\\image"
macro.endquote = "\\endquotation"
macro.relatesto = "\\relates"
-spurious = "Missing comma in .*" \
- "Missing pattern .*"
+spurious = "Missing comma in .*" \
+ "Missing pattern .*"
diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
index 5d52a47..044eef4 100644
--- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf
+++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
@@ -71,8 +71,8 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \
QT_END_INCLUDE_NAMESPACE \
PHONON_EXPORT \
Q_DECLARATIVE_EXPORT \
- Q_GADGET \
- QWEBKIT_EXPORT \
+ Q_GADGET \
+ QWEBKIT_EXPORT \
Q_INVOKABLE
Cpp.ignoredirectives = Q_DECLARE_HANDLE \
Q_DECLARE_INTERFACE \
@@ -93,6 +93,6 @@ Cpp.ignoredirectives = Q_DECLARE_HANDLE \
K_DECLARE_PRIVATE \
PHONON_OBJECT \
PHONON_HEIR \
- Q_PRIVATE_PROPERTY \
- Q_DECLARE_PRIVATE_D \
- Q_CLASSINFO
+ Q_PRIVATE_PROPERTY \
+ Q_DECLARE_PRIVATE_D \
+ Q_CLASSINFO
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
diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf
index 135fbbb..ca7caa9 100644
--- a/tools/qdoc3/test/qt-project.qdocconf
+++ b/tools/qdoc3/test/qt-project.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
project = Qt
description = Qt Reference Documentation
url = http://qt.nokia.com/doc/4.7
-version = 4.7.1
+version = 4.7.2
sourceencoding = UTF-8
outputencoding = UTF-8
@@ -20,9 +20,9 @@ qhp.Qt.virtualFolder = qdoc
qhp.Qt.indexTitle = Qt Reference Documentation
qhp.Qt.indexRoot =
-qhp.Qt.filterAttributes = qt 4.7.1 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.7.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.1
+qhp.Qt.filterAttributes = qt 4.7.2 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.7.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.2
qhp.Qt.subprojects = classes overviews examples
qhp.Qt.subprojects.classes.title = Classes
qhp.Qt.subprojects.classes.indexTitle = Qt's Classes