summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorDebao Zhang <hello@debao.me>2012-12-28 14:18:53 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-08 10:48:33 +0100
commit39795b1411a5ed17c47ef638c693d4b788442d0c (patch)
tree9862b40a06e239d4486966f9b972a475f7170da3 /src/corelib/tools
parent742f0c6e0b8e3ec6fddc146205e78a93f600c1cf (diff)
Replace macro qdoc with Q_QDOC
Both qdoc and Q_QDOC are used in source code, which looks not good. Change-Id: I4f3a71670278b0758d92bfa5db086a07e1b1acfd Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qalgorithms.h2
-rw-r--r--src/corelib/tools/qtimeline.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h
index 356f524ebb..4fcc032941 100644
--- a/src/corelib/tools/qalgorithms.h
+++ b/src/corelib/tools/qalgorithms.h
@@ -140,7 +140,7 @@ inline void qCount(const Container &container, const T &value, Size &n)
qCount(container.constBegin(), container.constEnd(), value, n);
}
-#ifdef qdoc
+#ifdef Q_QDOC
template <typename T>
LessThan qLess()
{
diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h
index 04ad5490c6..990b0a41f2 100644
--- a/src/corelib/tools/qtimeline.h
+++ b/src/corelib/tools/qtimeline.h
@@ -126,22 +126,22 @@ public Q_SLOTS:
Q_SIGNALS:
void valueChanged(qreal x
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void frameChanged(int
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void stateChanged(QTimeLine::State newState
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
, QPrivateSignal
#endif
);
void finished(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
QPrivateSignal
#endif
);