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>
2012-12-28 14:18:53 +08:00 · 2012-12-28 14:18:53 +08:00 · 39795b1411
commit 39795b1411
parent 742f0c6e0b
47 changed files with 100 additions and 100 deletions
--- a/src/concurrent/qtconcurrentfilter.h
+++ b/src/concurrent/qtconcurrentfilter.h
@ -53,7 +53,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifdef qdoc
+#ifdef Q_QDOC

 namespace QtConcurrent {

@ -258,7 +258,7 @@ OutputSequence blockingFiltered(Iterator begin, Iterator end, KeepFunctor keep)

 } // namespace QtConcurrent

-#endif // qdoc
+#endif // Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentfilterkernel.h
+++ b/src/concurrent/qtconcurrentfilterkernel.h
@ -54,7 +54,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifndef qdoc
+#ifndef Q_QDOC

 namespace QtConcurrent {

@ -340,7 +340,7 @@ inline ThreadEngineStarter<ResultType> startFilteredReduced(Iterator begin, Iter

 } // namespace QtConcurrent

-#endif // qdoc
+#endif // Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentfunctionwrappers.h
+++ b/src/concurrent/qtconcurrentfunctionwrappers.h
@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifndef qdoc
+#ifndef Q_QDOC

 namespace QtConcurrent {

@ -294,7 +294,7 @@ struct MapResultType<QStringList, U(C::*)() const>

 } // namespace QtPrivate.

-#endif //qdoc
+#endif //Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentiteratekernel.h
+++ b/src/concurrent/qtconcurrentiteratekernel.h
@ -56,7 +56,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifndef qdoc
+#ifndef Q_QDOC

 namespace QtConcurrent {

@ -300,7 +300,7 @@ public:

 } // namespace QtConcurrent

-#endif //qdoc
+#endif //Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentmap.h
+++ b/src/concurrent/qtconcurrentmap.h
@ -55,7 +55,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifdef qdoc
+#ifdef Q_QDOC

 namespace QtConcurrent {

@ -309,7 +309,7 @@ typename QtPrivate::MapResultType<Iterator, MapFunctor>::ResultType blockingMapp

 } // namespace QtConcurrent

-#endif // qdoc
+#endif // Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentmapkernel.h
+++ b/src/concurrent/qtconcurrentmapkernel.h
@ -53,7 +53,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifndef qdoc
+#ifndef Q_QDOC
 namespace QtConcurrent {

 // map kernel, works with both parallel-for and parallel-while
@ -262,7 +262,7 @@ inline ThreadEngineStarter<ResultType> startMappedReduced(Iterator begin, Iterat

 } // namespace QtConcurrent

-#endif //qdoc
+#endif //Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentmedian.h
+++ b/src/concurrent/qtconcurrentmedian.h
@ -53,7 +53,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifndef qdoc
+#ifndef Q_QDOC

 namespace QtConcurrent {

@ -119,7 +119,7 @@ private:

 } // namespace QtConcurrent

-#endif //qdoc
+#endif //Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentreducekernel.h
+++ b/src/concurrent/qtconcurrentreducekernel.h
@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE

 namespace QtConcurrent {

-#ifndef qdoc
+#ifndef Q_QDOC

 /*
    The ReduceQueueStartLimit and ReduceQueueThrottleLimit constants
@ -85,7 +85,7 @@ public:
    QVector<T> vector;
 };

-#endif // qdoc
+#endif // Q_QDOC

 enum ReduceOption {
    UnorderedReduce = 0x1,
@ -96,7 +96,7 @@ enum ReduceOption {
 Q_DECLARE_FLAGS(ReduceOptions, ReduceOption)
 Q_DECLARE_OPERATORS_FOR_FLAGS(ReduceOptions)

-#ifndef qdoc
+#ifndef Q_QDOC

 // supports both ordered and out-of-order reduction
 template <typename ReduceFunctor, typename ReduceResultType, typename T>
@ -242,7 +242,7 @@ struct SequenceHolder2 : public Base
    }
 };

-#endif //qdoc
+#endif //Q_QDOC

 } // namespace QtConcurrent

--- a/src/concurrent/qtconcurrentrun.h
+++ b/src/concurrent/qtconcurrentrun.h
@ -54,7 +54,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifdef qdoc
+#ifdef Q_QDOC

 namespace QtConcurrent {

@ -337,7 +337,7 @@ QFuture<T> run(const Class *object, T (Class::*fn)(Param1, Param2, Param3, Param

 } //namespace QtConcurrent

-#endif // qdoc
+#endif // Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentrunbase.h
+++ b/src/concurrent/qtconcurrentrunbase.h
@ -54,7 +54,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifndef qdoc
+#ifndef Q_QDOC

 namespace QtConcurrent {

@ -144,7 +144,7 @@ public:

 } //namespace QtConcurrent

-#endif //qdoc
+#endif //Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentstoredfunctioncall.h
+++ b/src/concurrent/qtconcurrentstoredfunctioncall.h
@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifndef qdoc
+#ifndef Q_QDOC

 namespace QtConcurrent {
 template <typename T, typename FunctionPointer>
@ -1302,7 +1302,7 @@ private:

 } //namespace QtConcurrent

-#endif // qdoc
+#endif // Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/concurrent/qtconcurrentthreadengine.h
+++ b/src/concurrent/qtconcurrentthreadengine.h
@ -58,7 +58,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#ifndef qdoc
+#ifndef Q_QDOC

 namespace QtConcurrent {

@ -270,7 +270,7 @@ inline ThreadEngineStarter<typename ThreadEngine::ResultType> startThreadEngine(

 } // namespace QtConcurrent

-#endif //qdoc
+#endif //Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/corelib/global/qflags.h
+++ b/src/corelib/global/qflags.h
@ -85,7 +85,7 @@ class QFlags
    struct Private;
    typedef int (Private::*Zero);
 public:
-#ifndef qdoc
+#ifndef Q_QDOC
    typedef typename QtPrivate::if_<
            QtPrivate::is_unsigned<Enum>::value,
            unsigned int,
@ -94,7 +94,7 @@ public:
 #endif
    typedef Enum enum_type;
    // compiler-generated copy/move ctor/assignment operators are fine!
-#ifdef qdoc
+#ifdef Q_QDOC
    typedef int Int; // the real typedef above is too complex for qdoc
    inline QFlags(const QFlags &other);
    inline QFlags &operator=(const QFlags &other);
--- a/src/corelib/global/qsysinfo.h
+++ b/src/corelib/global/qsysinfo.h
@ -70,7 +70,7 @@ public:
        BigEndian,
        LittleEndian

-#  ifdef qdoc
+#  ifdef Q_QDOC
        , ByteOrder = <platform-dependent>
 #  elif Q_BYTE_ORDER == Q_BIG_ENDIAN
        , ByteOrder = BigEndian
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@ -369,7 +369,7 @@ Q_OUTOFLINE_TEMPLATE QDataStream &operator<<(QDataStream &out, const QHash<Key,
    }
    return out;
 }
-#ifdef qdoc
+#ifdef Q_QDOC
 template <class Key, class T>
 Q_OUTOFLINE_TEMPLATE QDataStream &operator>>(QDataStream &in, QMap<Key, T> &map)
 #else
--- a/src/corelib/io/qfilesystemwatcher.h
+++ b/src/corelib/io/qfilesystemwatcher.h
@ -73,12 +73,12 @@ public:

 Q_SIGNALS:
    void fileChanged(const QString &path
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
        , QPrivateSignal
 #endif
    );
    void directoryChanged(const QString &path
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
        , QPrivateSignal
 #endif
    );
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE

 #ifndef QT_NO_PROCESS

-#if !defined(Q_OS_WIN) || defined(qdoc)
+#if !defined(Q_OS_WIN) || defined(Q_QDOC)
 typedef qint64 Q_PID;
 #else
 QT_END_NAMESPACE
@ -211,7 +211,7 @@ public Q_SLOTS:

 Q_SIGNALS:
    void started(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
        QPrivateSignal
 #endif
    );
@ -219,18 +219,18 @@ Q_SIGNALS:
    void finished(int exitCode, QProcess::ExitStatus exitStatus);
    void error(QProcess::ProcessError error);
    void stateChanged(QProcess::ProcessState state
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
        , QPrivateSignal
 #endif
    );

    void readyReadStandardOutput(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
        QPrivateSignal
 #endif
    );
    void readyReadStandardError(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
        QPrivateSignal
 #endif
    );
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@ -154,7 +154,7 @@ public:
        FullyDecoded = FullyEncoded | DecodeReserved | 0x4000000
    };
    Q_DECLARE_FLAGS(ComponentFormattingOptions, ComponentFormattingOption)
-#ifdef qdoc
+#ifdef Q_QDOC
    Q_DECLARE_FLAGS(FormattingOptions, UrlFormattingOption)
 #else
    typedef QUrlTwoFlags<UrlFormattingOption, ComponentFormattingOption> FormattingOptions;
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@ -252,78 +252,78 @@ Q_SIGNALS:
    void layoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint);

    void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );
    void rowsInserted(const QModelIndex &parent, int first, int last
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );

    void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );
    void rowsRemoved(const QModelIndex &parent, int first, int last
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );

    void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );
    void columnsInserted(const QModelIndex &parent, int first, int last
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );

    void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );
    void columnsRemoved(const QModelIndex &parent, int first, int last
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );

    void modelAboutToBeReset(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
    void modelReset(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );

    void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );
    void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );

    void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );
    void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      , QPrivateSignal
 #endif
    );
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@ -161,7 +161,7 @@ public Q_SLOTS:

 Q_SIGNALS:
    void aboutToQuit(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
    QPrivateSignal
 #endif
    );
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@ -574,7 +574,7 @@ namespace QtPrivate {

 template <typename T>
 int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName
-#ifndef qdoc
+#ifndef Q_QDOC
    , T * dummy = 0
    , typename QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::DefinedType defined = QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::Defined
 #endif
@ -604,7 +604,7 @@ int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normaliz

 template <typename T>
 int qRegisterMetaType(const char *typeName
-#ifndef qdoc
+#ifndef Q_QDOC
    , T * dummy = 0
    , typename QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::DefinedType defined = QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::Defined
 #endif
@ -621,7 +621,7 @@ int qRegisterMetaType(const char *typeName
 #ifndef QT_NO_DATASTREAM
 template <typename T>
 void qRegisterMetaTypeStreamOperators(const char *typeName
-#ifndef qdoc
+#ifndef Q_QDOC
    , T * /* dummy */ = 0
 #endif
 )
@ -634,7 +634,7 @@ void qRegisterMetaTypeStreamOperators(const char *typeName

 template <typename T>
 inline Q_DECL_CONSTEXPR int qMetaTypeId(
-#ifndef qdoc
+#ifndef Q_QDOC
    T * /* dummy */ = 0
 #endif
 )
@ -645,7 +645,7 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId(

 template <typename T>
 inline Q_DECL_CONSTEXPR int qRegisterMetaType(
-#if !defined(qdoc) && !defined(Q_CC_SUN)
+#if !defined(Q_QDOC) && !defined(Q_CC_SUN)
    T * dummy = 0
 #endif
 )
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@ -125,7 +125,7 @@ public:
    virtual bool event(QEvent *);
    virtual bool eventFilter(QObject *, QEvent *);

-#ifdef qdoc
+#ifdef Q_QDOC
    static QString tr(const char *sourceText, const char *comment = 0, int n = -1);
    static QString trUtf8(const char *sourceText, const char *comment = 0, int n = -1);
    virtual const QMetaObject *metaObject() const;
@ -367,7 +367,7 @@ public:
 Q_SIGNALS:
    void destroyed(QObject * = 0);
    void objectNameChanged(const QString &objectName
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
    , QPrivateSignal
 #endif
    );
@ -438,7 +438,7 @@ public:
 };
 #endif

-#ifdef qdoc
+#ifdef Q_QDOC
 T qFindChild(const QObject *o, const QString &name = QString());
 QList<T> qFindChildren(const QObject *oobj, const QString &name = QString());
 QList<T> qFindChildren(const QObject *o, const QRegExp &re);
--- a/src/corelib/kernel/qpointer.h
+++ b/src/corelib/kernel/qpointer.h
@ -95,7 +95,7 @@ public:
    { return *data(); }
    inline operator T*() const
    { return data(); }
-#ifdef qdoc
+#ifdef Q_QDOC
    inline bool isNull() const;
    inline void clear();
 #else
--- a/src/corelib/kernel/qsocketnotifier.h
+++ b/src/corelib/kernel/qsocketnotifier.h
@ -70,7 +70,7 @@ public Q_SLOTS:

 Q_SIGNALS:
    void activated(int socket
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
    , QPrivateSignal
 #endif
    );
--- a/src/corelib/kernel/qtimer.h
+++ b/src/corelib/kernel/qtimer.h
@ -89,7 +89,7 @@ public Q_SLOTS:

 Q_SIGNALS:
    void timeout(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@ -355,7 +355,7 @@ class Q_CORE_EXPORT QVariant
    { return canConvert(qMetaTypeId<T>()); }

 public:
-#ifndef qdoc
+#ifndef Q_QDOC
    struct PrivateShared
    {
        inline PrivateShared(void *v) : ptr(v), ref(1) { }
@ -533,7 +533,7 @@ inline bool QVariant::isDetached() const
 { return !d.is_shared || d.data.shared->ref.load() == 1; }


-#ifdef qdoc
+#ifdef Q_QDOC
    inline bool operator==(const QVariant &v1, const QVariant &v2);
    inline bool operator!=(const QVariant &v1, const QVariant &v2);
 #else
--- a/src/corelib/kernel/qwineventnotifier.h
+++ b/src/corelib/kernel/qwineventnotifier.h
@ -72,7 +72,7 @@ public Q_SLOTS:

 Q_SIGNALS:
    void activated(HANDLE hEvent
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
    , QPrivateSignal
 #endif
    );
--- a/src/corelib/statemachine/qabstractstate.h
+++ b/src/corelib/statemachine/qabstractstate.h
@ -66,12 +66,12 @@ public:

 Q_SIGNALS:
    void entered(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
    void exited(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@ -89,7 +89,7 @@ public:

 Q_SIGNALS:
    void triggered(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@ -101,12 +101,12 @@ public:

 Q_SIGNALS:
    void finished(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
    void propertiesAssigned(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@ -154,12 +154,12 @@ public Q_SLOTS:

 Q_SIGNALS:
    void started(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
    void stopped(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
--- a/src/corelib/thread/qatomic.h
+++ b/src/corelib/thread/qatomic.h
@ -81,7 +81,7 @@ public:
        return *this;
    }

-#ifdef qdoc
+#ifdef Q_QDOC
    int load() const;
    int loadAcquire() const;
    void store(int newValue);
@ -143,7 +143,7 @@ public:
        return *this;
    }

-#ifdef qdoc
+#ifdef Q_QDOC
    T *load() const;
    T *loadAcquire() const;
    void store(T *newValue);
--- a/src/corelib/thread/qexception.cpp
+++ b/src/corelib/thread/qexception.cpp
@ -137,7 +137,7 @@ QUnhandledException *QUnhandledException::clone() const
    return new QUnhandledException(*this);
 }

-#ifndef qdoc
+#ifndef Q_QDOC

 namespace QtPrivate {

@ -200,7 +200,7 @@ bool ExceptionStore::hasThrown() const { return exceptionHolder.base->hasThrown;

 } // namespace QtPrivate

-#endif //qdoc
+#endif //Q_QDOC

 QT_END_NAMESPACE

--- a/src/corelib/thread/qfuturewatcher.h
+++ b/src/corelib/thread/qfuturewatcher.h
@ -131,7 +131,7 @@ public:
    T result() const { return m_future.result(); }
    T resultAt(int index) const { return m_future.resultAt(index); }

-#ifdef qdoc
+#ifdef Q_QDOC
    int progressValue() const;
    int progressMinimum() const;
    int progressMaximum() const;
--- a/src/corelib/thread/qmutex.h
+++ b/src/corelib/thread/qmutex.h
@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE


-#if !defined(QT_NO_THREAD) && !defined(qdoc)
+#if !defined(QT_NO_THREAD) && !defined(Q_QDOC)

 #ifdef Q_OS_LINUX
 # define QT_MUTEX_LOCK_NOEXCEPT Q_DECL_NOTHROW
@ -173,7 +173,7 @@ private:
    quintptr val;
 };

-#else // QT_NO_THREAD or qdoc
+#else // QT_NO_THREAD or Q_QDOC

 class Q_CORE_EXPORT QMutex
 {
@ -207,7 +207,7 @@ private:

 typedef QMutex QBasicMutex;

-#endif // QT_NO_THREAD or qdoc
+#endif // QT_NO_THREAD or Q_QDOC

 QT_END_NAMESPACE

--- a/src/corelib/thread/qresultstore.h
+++ b/src/corelib/thread/qresultstore.h
@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
    either individually or in batches.
 */

-#ifndef qdoc
+#ifndef Q_QDOC

 namespace QtPrivate {

@ -231,7 +231,7 @@ public:

 } // namespace QtPrivate

-#endif //qdoc
+#endif //Q_QDOC

 QT_END_NAMESPACE
 QT_END_HEADER
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@ -113,12 +113,12 @@ public:

 Q_SIGNALS:
    void started(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
    void finished(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
      QPrivateSignal
 #endif
    );
--- 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()
 {
--- 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
    );
--- a/src/dbus/qdbusmetatype.h
+++ b/src/dbus/qdbusmetatype.h
@ -76,7 +76,7 @@ void qDBusDemarshallHelper(const QDBusArgument &arg, T *t)

 template<typename T>
 int qDBusRegisterMetaType(
-#ifndef qdoc
+#ifndef Q_QDOC
    T * /* dummy */ = 0
 #endif
 )
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@ -64,7 +64,7 @@ class QWindow;

 // We need to inherit QObject to expose the enums to QML.
 class Q_GUI_EXPORT QAccessible
-#ifndef qdoc
+#ifndef Q_QDOC
        :public QObject
 #endif
 {
@ -269,7 +269,7 @@ public:
        StaticText     = 0x00000029,
        EditableText   = 0x0000002A,  // Editable, selectable, etc.
        Button         = 0x0000002B,
-#ifndef qdoc
+#ifndef Q_QDOC
        PushButton     = Button, // deprecated
 #endif
        CheckBox       = 0x0000002C,
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@ -122,7 +122,7 @@ public:
        Format_Grayscale2,
        Format_Grayscale2LSB
 #endif
-#ifndef qdoc
+#ifndef Q_QDOC
        NImageFormats
 #endif
    };
--- a/src/gui/kernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
@ -61,7 +61,7 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks);
 Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks);
 #endif

-#ifdef qdoc
+#ifdef Q_QDOC
 void qt_set_sequence_auto_mnemonic(bool b);
 #endif

--- a/src/printsupport/dialogs/qprintdialog.h
+++ b/src/printsupport/dialogs/qprintdialog.h
@ -91,7 +91,7 @@ public:
 #endif
    void open(QObject *receiver, const char *member);

-#ifdef qdoc
+#ifdef Q_QDOC
    QPrinter *printer();
 #endif

--- a/src/printsupport/kernel/qprinter.h
+++ b/src/printsupport/kernel/qprinter.h
@ -221,7 +221,7 @@ public:
    QRectF paperRect(Unit) const;
    QRectF pageRect(Unit) const;

-#if !defined(Q_OS_WIN) || defined(qdoc)
+#if !defined(Q_OS_WIN) || defined(Q_QDOC)
    QString printerSelectionOption() const;
    void setPrinterSelectionOption(const QString &);
 #endif
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@ -249,7 +249,7 @@ namespace QTest
    Q_TESTLIB_EXPORT bool compare_string_helper(const char *t1, const char *t2, const char *actual,
                                      const char *expected, const char *file, int line);

-#ifndef qdoc
+#ifndef Q_QDOC
    QTEST_COMPARE_DECL(short)
    QTEST_COMPARE_DECL(ushort)
    QTEST_COMPARE_DECL(int)
--- a/src/widgets/dialogs/qmessagebox.h
+++ b/src/widgets/dialogs/qmessagebox.h
@ -288,7 +288,7 @@ public:
 Q_SIGNALS:
    void buttonClicked(QAbstractButton *button);

-#ifdef qdoc
+#ifdef Q_QDOC
 public Q_SLOTS:
    int exec();
 #endif