diff options
| author | Jonathan Liu <net147@gmail.com> | 2013-09-03 05:54:16 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 08:13:12 (GMT) |
| commit | 53586c9d7d5b36e184dbf2d1ebf209db7c85ae8c (patch) | |
| tree | 072d2d11568a0fbb50025163da0f485cf27feaed /src | |
| parent | 5bb495c9b8f64bc2cb435d62674f2b0fdfa5d764 (diff) | |
| download | Qt-53586c9d7d5b36e184dbf2d1ebf209db7c85ae8c.zip Qt-53586c9d7d5b36e184dbf2d1ebf209db7c85ae8c.tar.gz Qt-53586c9d7d5b36e184dbf2d1ebf209db7c85ae8c.tar.bz2 | |
Fix compile when QT_NO_WARNING_OUTPUT defined without QT_NO_DEBUG_STREAM
qWarning is forward declared as returning QDebug when QT_NO_DEBUG_STREAM
is not defined. This conflicts with the declaration of qWarning
returning QNoDebug when QT_NO_WARNING_OUTPUT is defined.
Avoid forward declaration of qWarning when QT_NO_WARNING_OUTPUT is not
defined to fix compilation.
This does not apply to Qt 5.
Task-number: QTBUG-33301
Change-Id: Ia4750cd63ac404700aedc36f07e5516d4163e9d2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index b28e51c..6de28b6 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1792,7 +1792,9 @@ class QDebug; class QNoDebug; #ifndef QT_NO_DEBUG_STREAM Q_CORE_EXPORT_INLINE QDebug qDebug(); +#ifndef QT_NO_WARNING_OUTPUT Q_CORE_EXPORT_INLINE QDebug qWarning(); +#endif Q_CORE_EXPORT_INLINE QDebug qCritical(); #else inline QNoDebug qDebug(); |