diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-25 10:50:14 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-25 10:50:15 +0200 |
commit | e1a6475a2a3ea46b2afbc2f154c18b255466dad7 (patch) | |
tree | 6e400e8def7a391c05d9b6ce174f1f6490544d18 | |
parent | b09cf7966fdf8a6949acd912cfb054556d155ee8 (diff) | |
parent | 5ca18a3f21083151b771f0efa2a2605f183c8166 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ibf39232616ea6ef67242b70011aa683ce8dc0b4f
-rw-r--r-- | dist/changes-5.12.3 | 46 | ||||
-rw-r--r-- | src/quicktemplates2/qquickscrollbar.cpp | 16 | ||||
-rw-r--r-- | tests/auto/shared/util.cpp | 7 | ||||
-rw-r--r-- | tests/auto/shared/util.pri | 6 |
4 files changed, 71 insertions, 4 deletions
diff --git a/dist/changes-5.12.3 b/dist/changes-5.12.3 new file mode 100644 index 00000000..8a9bad9f --- /dev/null +++ b/dist/changes-5.12.3 @@ -0,0 +1,46 @@ +Qt 5.12.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.2. + +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. + +**************************************************************************** +* Controls * +**************************************************************************** + + - [QTBUG-70451] DialogButtonBox: fixed buttons with equal roles being + randomly sorted. + - [QTBUG-70161] ComboBox: fixed popup immediately closing on iOS + - [QTBUG-72886] DialogButtonBox: fixed content size calculation + - [QTBUG-74226] Fixed attached ToolTips using the timeout of the last shown + tool tip + - [QTBUG-72536] ScrollView now respects the content size set on/by + the flickable + - [QTBUG-73354] Menu: enter/return can now be used to activate items, + rather than just space. + - [QTBUG-71290] Drawer: fixed infinite positioning loop + - [QTBUG-66494] Page: fixed binding loop + +**************************************************************************** +* Styles * +**************************************************************************** + +Default +-------- + - [QTBUG-72786] Made ItemDelegate respect highlightedText and improved + highlightedText color so that text shows up against a highlighted background. + This also allows easily switching ComboBox to a dark style via palette + customization. diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index 52daa27f..535151d6 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -40,6 +40,9 @@ #include <QtQml/qqmlinfo.h> #include <QtQuick/private/qquickflickable_p.h> +#if QT_CONFIG(accessibility) +#include <QtQuick/private/qquickaccessibleattached_p.h> +#endif QT_BEGIN_NAMESPACE @@ -724,8 +727,19 @@ void QQuickScrollBar::accessibilityActiveChanged(bool active) QQuickControl::accessibilityActiveChanged(active); Q_D(QQuickScrollBar); - if (active) + if (active) { setAccessibleProperty("pressed", d->pressed); + + if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(this)) { + connect(accessibleAttached, &QQuickAccessibleAttached::increaseAction, this, &QQuickScrollBar::increase); + connect(accessibleAttached, &QQuickAccessibleAttached::decreaseAction, this, &QQuickScrollBar::decrease); + } + } else { + if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(this)) { + disconnect(accessibleAttached, &QQuickAccessibleAttached::increaseAction, this, &QQuickScrollBar::increase); + disconnect(accessibleAttached, &QQuickAccessibleAttached::decreaseAction, this, &QQuickScrollBar::decrease); + } + } } QAccessible::Role QQuickScrollBar::accessibleRole() const diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp index e9e58993..2f6b7f54 100644 --- a/tests/auto/shared/util.cpp +++ b/tests/auto/shared/util.cpp @@ -53,7 +53,9 @@ QQmlDataTest::QQmlDataTest() : m_dataDirectory(QTest::qFindTestData("data", QT_QMLTEST_DATADIR, 0)), #endif - m_dataDirectoryUrl(QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) + m_dataDirectoryUrl(m_dataDirectory.startsWith(QLatin1Char(':')) + ? QUrl(QLatin1String("qrc") + m_dataDirectory) + : QUrl::fromLocalFile(m_dataDirectory + QLatin1Char('/'))) { m_instance = this; } @@ -67,7 +69,8 @@ void QQmlDataTest::initTestCase() { QVERIFY2(!m_dataDirectory.isEmpty(), "'data' directory not found"); m_directory = QFileInfo(m_dataDirectory).absolutePath(); - QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory)); + if (m_dataDirectoryUrl.scheme() != QLatin1String("qrc")) + QVERIFY2(QDir::setCurrent(m_directory), qPrintable(QLatin1String("Could not chdir to ") + m_directory)); } QString QQmlDataTest::testFile(const QString &fileName) const diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri index 16f37f8a..99607a66 100644 --- a/tests/auto/shared/util.pri +++ b/tests/auto/shared/util.pri @@ -6,5 +6,9 @@ HEADERS += $$PWD/visualtestutil.h \ SOURCES += $$PWD/visualtestutil.cpp \ $$PWD/util.cpp -DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\" +android|ios { + DEFINES += QT_QMLTEST_DATADIR=\\\":/data\\\" +} else { + DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\" +} DEFINES += QQC2_IMPORT_PATH=\\\"$$QQC2_SOURCE_TREE/src/imports\\\" |