diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 05:44:45 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-24 05:44:45 +0000 |
| commit | 4e41babd0337473a1078d3a5f3367cc1fc5f2935 (patch) | |
| tree | fc7a7ceecd529310fcd6a6a869034a8ea75388e1 /src/corelib/tools/qsharedpointer_impl.h | |
| parent | aa2a3102676a5608d7ad22b868895ec93681a5d9 (diff) | |
| parent | 56d6e000f7487c59172330ebd23a718268c508f1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qsharedpointer_impl.h')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index bbac2d0327..d051ed6099 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -62,7 +62,6 @@ QT_END_NAMESPACE #include <new> #include <QtCore/qatomic.h> #include <QtCore/qobject.h> // for qobject_cast -#include <QtCore/qdebug.h> #if QT_DEPRECATED_SINCE(5, 6) #include <QtCore/qhash.h> #endif @@ -883,16 +882,6 @@ inline void qSwap(QSharedPointer<T> &p1, QSharedPointer<T> &p2) p1.swap(p2); } -#ifndef QT_NO_DEBUG_STREAM -template <class T> -Q_INLINE_TEMPLATE QDebug operator<<(QDebug debug, const QSharedPointer<T> &ptr) -{ - QDebugStateSaver saver(debug); - debug.nospace() << "QSharedPointer(" << ptr.data() << ")"; - return debug; -} -#endif - QT_END_NAMESPACE namespace std { template <class T> |