From dc9ccfb331119d319c7a620c075d04355e4745cf Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 28 Feb 2019 09:35:39 +0100 Subject: Skip Tests_ScrollView::test_dragFetchAppend It's notoriously flaky, with several attempts to stabilise it so far, and it's now blocking 5.13. I would blacklist it, but QTBUG-74117. Task-number: QTBUG-55727 Change-Id: I653f534ed712fa5af9bcf6340faee2cae2f1c99b (cherry picked from commit 6b62b506d6eb06271e082dcedaf75fd588a5b17c) Reviewed-by: Frederik Gladhorn --- tests/auto/controls/data/tst_scrollview.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index d3bfac4b..be35bedb 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -179,6 +179,8 @@ TestCase { } function test_dragFetchAppend() { // QTBUG-50795 + skip("This is flaky: QTBUG-55727. Can't use BLACKLIST because of QTBUG-74117.") + var scrollView = dragFetchAppendComponent.createObject(container) verify(scrollView !== null, "view created is null") waitForRendering(scrollView) -- cgit v1.2.1 From 4e156bb26fb904663b0e13df1802dc2e0788b114 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 1 Jul 2019 16:02:21 +0200 Subject: Bump version Change-Id: Ic894f3b21f7734067ba0d0375101179306580c55 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index bc353b73..e9edac5c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop -MODULE_VERSION = 5.12.4 +MODULE_VERSION = 5.12.5 -- cgit v1.2.1 From 42812dfd813745beed928e40621ae9deb88a9247 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 3 Jul 2019 11:54:02 +0200 Subject: Doc: Replace example file lists with links to code.qt.io Task-number: QTBUG-74391 Change-Id: If30143e106fec5a8694c47ab2376aeda36faf8e1 Reviewed-by: Paul Wicking --- src/controls/doc/qtquickcontrols1.qdocconf | 1 + src/dialogs/doc/qtquickdialogs.qdocconf | 1 + src/extras/doc/qtquickextras.qdocconf | 1 + 3 files changed, 3 insertions(+) diff --git a/src/controls/doc/qtquickcontrols1.qdocconf b/src/controls/doc/qtquickcontrols1.qdocconf index d2ea0c47..1a795dd1 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 c617e27d..51c2dd33 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 d7a56c82..7a82854c 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 -- cgit v1.2.1