diff options
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qdatastream.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qfilesystemwatcher.h | 4 | ||||
-rw-r--r-- | src/corelib/io/qprocess.h | 10 | ||||
-rw-r--r-- | src/corelib/io/qurl.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 7fe2598cd5..89538a5fcf 100644 --- 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 diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h index 6fbbdae157..b5c79303ef 100644 --- 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 ); diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index bf4f2fb55b..604b60d333 100644 --- 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 ); diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index fcea4fd6ad..c45708cc1a 100644 --- 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; |