1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QVector: make sure the forwarding headers for the Java iterators exist

Browse Source 
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"

Fixes: QTBUG-103742
Change-Id: I77c8221eb2824c369feffffd16f128a983f4866c
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 34cb03da89188c8c6566681a2c2548731b007099)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2022-05-21 08:34:06 -07:00 committed by Qt Cherry-pick Bot
parent 22c19f95d3
commit f499ef159e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/tools/qvector.h
View File

@ -43,6 +43,12 @@
#include <QtCore/qlist.h>
#include <QtCore/qcontainerfwd.h>
#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)

1
sync.profile
View File

@ -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",