From 34cb03da89188c8c6566681a2c2548731b007099 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 21 May 2022 08:34:06 -0700 Subject: QVector: make sure the forwarding headers for the Java iterators exist They used to in Qt 5. And now they do again: $ grep . include/QtCore/Q*Vector* include/QtCore/QMutableVectorIterator:#include "qvector.h" include/QtCore/QVector:#include "qvector.h" include/QtCore/QVectorIterator:#include "qvector.h" Pick-to: 6.2 6.3 Fixes: QTBUG-103742 Change-Id: I77c8221eb2824c369feffffd16f128a983f4866c Reviewed-by: Marc Mutz --- src/corelib/tools/qvector.h | 6 ++++++ sync.profile | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index afafb8f9e5..4fad2bce8f 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -7,6 +7,12 @@ #include #include +#if 0 +#pragma qt_class(QVector) +#pragma qt_class(QMutableVectorIterator) +#pragma qt_class(QVectorIterator) +#endif + QT_BEGIN_NAMESPACE #if !defined(QT_NO_JAVA_STYLE_ITERATORS) diff --git a/sync.profile b/sync.profile index 70f652ecf4..a5a946e553 100644 --- a/sync.profile +++ b/sync.profile @@ -45,7 +45,6 @@ "qconfig.h" => "QtConfig", "qplugin.h" => "QtPlugin", "qalgorithms.h" => "QtAlgorithms", - "qvector.h" => "QVector", "qcontainerfwd.h" => "QtContainerFwd", "qdebug.h" => "QtDebug", "qevent.h" => "QtEvents", -- cgit v1.2.3