diff options
| -rw-r--r-- | src/corelib/io/qdirlisting.h | 10 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/corelib/io/qdirlisting.h b/src/corelib/io/qdirlisting.h index 73a13ed611f..94aec0934fb 100644 --- a/src/corelib/io/qdirlisting.h +++ b/src/corelib/io/qdirlisting.h @@ -20,6 +20,7 @@ QT_BEGIN_NAMESPACE class QDirListingPrivate; class QFileInfo; +class QDebug; class QDir; class QTimeZone; @@ -150,6 +151,10 @@ public: const_iterator constBegin() const { return begin(); } sentinel constEnd() const { return end(); } +#ifndef QT_NO_DEBUG_STREAM + Q_CORE_EXPORT friend QDebug operator<<(QDebug debug, QDirListing::IteratorFlags flags); +#endif + private: Q_DISABLE_COPY(QDirListing) @@ -160,11 +165,6 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QDirListing::IteratorFlags) -#ifndef QT_NO_DEBUG_STREAM -class QDebug; -Q_CORE_EXPORT QDebug operator<<(QDebug debug, QDirListing::IteratorFlags flags); -#endif - QT_END_NAMESPACE #endif // QDIRLISTING_H diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 565f9182e68..580e830782e 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -2524,7 +2524,7 @@ bool QMetaType::convert(QMetaType fromType, const void *from, QMetaType toType, if (toTypeId == qMetaTypeId<QMetaAssociation::Iterable>()) return convertToAssociativeIterable<QMetaAssociation::Iterable>(fromType, from, to); -#if QT_DEPRECATED_SINCE(6, 13) +#if QT_DEPRECATED_SINCE(6, 15) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED @@ -2550,7 +2550,7 @@ bool QMetaType::convert(QMetaType fromType, const void *from, QMetaType toType, return convertToAssociativeIterable<QAssociativeIterable>(fromType, from, to); QT_WARNING_POP -#endif // QT_DEPRECATED_SINCE(6, 13) +#endif // QT_DEPRECATED_SINCE(6, 15) return convertMetaObject(fromType, from, toType, to); } @@ -2578,7 +2578,7 @@ bool QMetaType::view(QMetaType fromType, void *from, QMetaType toType, void *to) if (toTypeId == qMetaTypeId<QMetaAssociation::Iterable>()) return viewAsAssociativeIterable<QMetaAssociation::Iterable>(fromType, from, to); -#if QT_DEPRECATED_SINCE(6, 13) +#if QT_DEPRECATED_SINCE(6, 15) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED @@ -2589,7 +2589,7 @@ bool QMetaType::view(QMetaType fromType, void *from, QMetaType toType, void *to) return viewAsAssociativeIterable<QAssociativeIterable>(fromType, from, to); QT_WARNING_POP -#endif // QT_DEPRECATED_SINCE(6, 13) +#endif // QT_DEPRECATED_SINCE(6, 15) return convertMetaObject(fromType, from, toType, to); } @@ -2629,7 +2629,7 @@ bool QMetaType::canView(QMetaType fromType, QMetaType toType) if (toTypeId == qMetaTypeId<QMetaAssociation::Iterable>()) return canImplicitlyViewAsAssociativeIterable(fromType); -#if QT_DEPRECATED_SINCE(6, 13) +#if QT_DEPRECATED_SINCE(6, 15) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED @@ -2640,7 +2640,7 @@ bool QMetaType::canView(QMetaType fromType, QMetaType toType) return canImplicitlyViewAsAssociativeIterable(fromType); QT_WARNING_POP -#endif +#endif // QT_DEPRECATED_SINCE(6, 15) if (canConvertMetaObject(fromType, toType)) return true; @@ -2768,7 +2768,7 @@ bool QMetaType::canConvert(QMetaType fromType, QMetaType toType) return true; } -#if QT_DEPRECATED_SINCE(6, 13) +#if QT_DEPRECATED_SINCE(6, 15) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED @@ -2789,7 +2789,7 @@ bool QMetaType::canConvert(QMetaType fromType, QMetaType toType) } QT_WARNING_POP -#endif // QT_DEPRECATED_SINCE(6, 13) +#endif // QT_DEPRECATED_SINCE(6, 15) if (toTypeId == QVariantPair && hasRegisteredConverterFunction( fromType, QMetaType::fromType<QtMetaTypePrivate::QPairVariantInterfaceImpl>())) |