summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--dist/changes-5.12.520
-rw-r--r--dist/changes-5.13.120
-rw-r--r--examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp18
-rw-r--r--examples/quickcontrols/controls/texteditor/src/documenthandler.cpp3
-rw-r--r--src/controls/doc/qtquickcontrols1.qdocconf1
-rw-r--r--src/dialogs/doc/qtquickdialogs.qdocconf1
-rw-r--r--src/extras/doc/qtquickextras.qdocconf1
-rw-r--r--tests/auto/extras/BLACKLIST2
-rw-r--r--tests/auto/extras/data/tst_tumbler.qml3
-rw-r--r--tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp16
-rw-r--r--tests/auto/shared/testmodel.h3
-rw-r--r--tests/benchmarks/objectcount/tst_objectcount.cpp4
13 files changed, 65 insertions, 29 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 718595682..bc93bfbc8 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,6 @@ load(qt_build_config)
CONFIG += warning_clean
android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop
+DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
+
MODULE_VERSION = 6.0.0
diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5
new file mode 100644
index 000000000..e8be9316f
--- /dev/null
+++ b/dist/changes-5.12.5
@@ -0,0 +1,20 @@
+Qt 5.12.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.4.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1
new file mode 100644
index 000000000..57ebdbebd
--- /dev/null
+++ b/dist/changes-5.13.1
@@ -0,0 +1,20 @@
+Qt 5.13.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp
index b93641a90..1e47f23e5 100644
--- a/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp
+++ b/examples/quickcontrols/controls/tableview/src/sortfilterproxymodel.cpp
@@ -132,11 +132,8 @@ QJSValue SortFilterProxyModel::get(int idx) const
QJSValue value = engine->newObject();
if (idx >= 0 && idx < count()) {
QHash<int, QByteArray> roles = roleNames();
- QHashIterator<int, QByteArray> it(roles);
- while (it.hasNext()) {
- it.next();
+ for (auto it = roles.cbegin(), end = roles.cend(); it != end; ++it)
value.setProperty(QString::fromUtf8(it.value()), data(index(idx, 0), it.key()).toString());
- }
}
return value;
}
@@ -156,14 +153,7 @@ void SortFilterProxyModel::componentComplete()
int SortFilterProxyModel::roleKey(const QByteArray &role) const
{
- QHash<int, QByteArray> roles = roleNames();
- QHashIterator<int, QByteArray> it(roles);
- while (it.hasNext()) {
- it.next();
- if (it.value() == role)
- return it.key();
- }
- return -1;
+ return roleNames().key(role, -1);
}
QHash<int, QByteArray> SortFilterProxyModel::roleNames() const
@@ -181,9 +171,7 @@ bool SortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
QAbstractItemModel *model = sourceModel();
if (filterRole().isEmpty()) {
QHash<int, QByteArray> roles = roleNames();
- QHashIterator<int, QByteArray> it(roles);
- while (it.hasNext()) {
- it.next();
+ for (auto it = roles.cbegin(), end = roles.cend(); it != end; ++it) {
QModelIndex sourceIndex = model->index(sourceRow, 0, sourceParent);
QString key = model->data(sourceIndex, it.key()).toString();
if (key.contains(rx))
diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
index 69da88f0b..ac9f5bd47 100644
--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
@@ -345,7 +345,8 @@ QStringList DocumentHandler::defaultFontSizes() const
// uhm... this is quite ugly
QStringList sizes;
QFontDatabase db;
- foreach (int size, db.standardSizes())
+ const auto standardSizes = db.standardSizes();
+ for (int size : standardSizes)
sizes.append(QString::number(size));
return sizes;
}
diff --git a/src/controls/doc/qtquickcontrols1.qdocconf b/src/controls/doc/qtquickcontrols1.qdocconf
index d2ea0c475..1a795dd11 100644
--- a/src/controls/doc/qtquickcontrols1.qdocconf
+++ b/src/controls/doc/qtquickcontrols1.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)
project = QtQuickControls1
description = Qt Quick Controls 1 Reference Documentation
diff --git a/src/dialogs/doc/qtquickdialogs.qdocconf b/src/dialogs/doc/qtquickdialogs.qdocconf
index c617e27d2..51c2dd33a 100644
--- a/src/dialogs/doc/qtquickdialogs.qdocconf
+++ b/src/dialogs/doc/qtquickdialogs.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)
project = QtQuickDialogs
description = Qt Quick Dialogs Reference Documentation
diff --git a/src/extras/doc/qtquickextras.qdocconf b/src/extras/doc/qtquickextras.qdocconf
index d7a56c82e..7a82854c3 100644
--- a/src/extras/doc/qtquickextras.qdocconf
+++ b/src/extras/doc/qtquickextras.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtquickcontrols.qdocconf)
project = QtQuickExtras
description = Qt Quick Extras Reference Documentation
diff --git a/tests/auto/extras/BLACKLIST b/tests/auto/extras/BLACKLIST
index 3d8aae5d0..9056046d9 100644
--- a/tests/auto/extras/BLACKLIST
+++ b/tests/auto/extras/BLACKLIST
@@ -1,5 +1,7 @@
[Tests_Picture::test_color]
msvc-2019
+[Tests_Picture::test_source]
+msvc-2019
[Tests_StatusIndicator::test_active]
msvc-2019
[Tests_StatusIndicator::test_baseStyleHasOuterShadow]
diff --git a/tests/auto/extras/data/tst_tumbler.qml b/tests/auto/extras/data/tst_tumbler.qml
index 5585b5db4..e3e444714 100644
--- a/tests/auto/extras/data/tst_tumbler.qml
+++ b/tests/auto/extras/data/tst_tumbler.qml
@@ -349,7 +349,8 @@ Item {
var pos = Qt.point(columnXCenter(tumbler, 0), tumbler.__style.padding.top);
mouseDrag(tumbler, pos.x, pos.y, 0, tumbler.height - tumbler.__style.padding.bottom,
Qt.LeftButton, Qt.NoModifier, 300);
- tryCompare(tumbler.__viewAt(0), "offset", Settings.styleName === "Flat" ? 6.0 : 4.0);
+ // See QTBUG-78471
+ //tryCompare(tumbler.__viewAt(0), "offset", Settings.styleName === "Flat" ? 6.0 : 4.0);
tumbler.height += 100;
var padding = tumbler.__style.padding;
diff --git a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp
index 0fec548d8..c035c6760 100644
--- a/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp
+++ b/tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp
@@ -1181,8 +1181,8 @@ void tst_QQuickTreeModelAdaptor::reparentOnSameRow()
// at least DepthRole and ModeIndexRole changes should have happened for the affected row
bool depthChanged = false;
bool modelIndexChanged = false;
- QList<QList<QVariant> > &changes = dataChangedSpy;
- foreach (QList<QVariant> change, changes) {
+ const QList<QList<QVariant> > &changes = dataChangedSpy;
+ for (const QList<QVariant> &change : changes) {
if (change.at(0) == movedIndex) {
if (change.at(2).value<QVector<int> >().contains(QQuickTreeModelAdaptor1::DepthRole))
depthChanged = true;
@@ -1258,7 +1258,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange()
QCOMPARE(sel.count(), 2);
// We don't know in which order the selection ranges are
// being added, so we iterate and try to find what we expect.
- foreach (const QItemSelectionRange &range, sel) {
+ for (const QItemSelectionRange &range : sel) {
if (range.topLeft() == model.index(0, 0))
QCOMPARE(QModelIndex(range.bottomRight()), model.index(0, 0));
else if (range.topLeft() == model.index(0, 0, parent))
@@ -1275,7 +1275,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange()
QCOMPARE(sel.count(), 2);
// We don't know in which order the selection ranges are
// being added, so we iterate and try to find what we expect.
- foreach (const QItemSelectionRange &range, sel) {
+ for (const QItemSelectionRange &range : sel) {
if (range.topLeft() == model.index(0, 0))
QCOMPARE(QModelIndex(range.bottomRight()), model.index(4, 0));
else if (range.topLeft() == model.index(0, 0, parent))
@@ -1296,7 +1296,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange()
QCOMPARE(sel.count(), 3);
// We don't know in which order the selection ranges are
// being added, so we iterate and try to find what we expect.
- foreach (const QItemSelectionRange &range, sel) {
+ for (const QItemSelectionRange &range : sel) {
if (range.topLeft() == model.index(0, 0))
QCOMPARE(QModelIndex(range.bottomRight()), model.index(4, 0));
else if (range.topLeft() == model.index(0, 0, parent))
@@ -1319,7 +1319,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange()
QCOMPARE(sel.count(), 3);
// We don't know in which order the selection ranges are
// being added, so we iterate and try to find what we expect.
- foreach (const QItemSelectionRange &range, sel) {
+ for (const QItemSelectionRange &range : sel) {
if (range.topLeft() == model.index(0, 0))
QCOMPARE(QModelIndex(range.bottomRight()), model.index(0, 0));
else if (range.topLeft() == model.index(0, 0, parent))
@@ -1338,7 +1338,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange()
QCOMPARE(sel.count(), 4);
// We don't know in which order the selection ranges are
// being added, so we iterate and try to find what we expect.
- foreach (const QItemSelectionRange &range, sel) {
+ for (const QItemSelectionRange &range : sel) {
if (range.topLeft() == model.index(0, 0))
QCOMPARE(QModelIndex(range.bottomRight()), model.index(ModelRowCount - 1, 0));
else if (range.topLeft() == model.index(0, 0, parent))
@@ -1359,7 +1359,7 @@ void tst_QQuickTreeModelAdaptor::selectionForRowRange()
QCOMPARE(sel.count(), 4);
// We don't know in which order the selection ranges are
// being added, so we iterate and try to find what we expect.
- foreach (const QItemSelectionRange &range, sel) {
+ for (const QItemSelectionRange &range : sel) {
if (range.topLeft() == model.index(1, 0))
QCOMPARE(QModelIndex(range.bottomRight()), model.index(1, 0));
else if (range.topLeft() == model.index(1, 0, parent))
diff --git a/tests/auto/shared/testmodel.h b/tests/auto/shared/testmodel.h
index 6eaab74aa..b1d9308e4 100644
--- a/tests/auto/shared/testmodel.h
+++ b/tests/auto/shared/testmodel.h
@@ -289,8 +289,7 @@ public:
~Node()
{
- foreach (Node *n, children)
- delete n;
+ qDeleteAll(children);
}
void addRows(int row, int count)
diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp
index c57971603..996b4b66c 100644
--- a/tests/benchmarks/objectcount/tst_objectcount.cpp
+++ b/tests/benchmarks/objectcount/tst_objectcount.cpp
@@ -83,7 +83,7 @@ static void printItems(const QList<QQuickItem *> &items)
std::cout << " QQuickItems: " << items.count() << " (total of QObjects: " << qt_qobjects->count() << ")" << std::endl;
if (qt_verbose) {
- foreach (QObject *object, *qt_qobjects)
+ for (QObject *object : qAsConst(*qt_qobjects))
qInfo() << "\t" << object;
}
}
@@ -101,7 +101,7 @@ void tst_ObjectCount::controls()
QVERIFY2(object.data(), qPrintable(component.errorString()));
QList<QQuickItem *> items;
- foreach (QObject *object, *qt_qobjects()) {
+ for (QObject *object : qAsConst(*qt_qobjects)) {
QQuickItem *item = qobject_cast<QQuickItem *>(object);
if (item)
items += item;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 20:51:09 +0000