diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:48:47 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:48:47 +0100 |
commit | e5d4a5828b67ab9dbad57d5d47f535b2b0841d92 (patch) | |
tree | c54b144ea5a04f66f91aaa5f1c161fecef670354 | |
parent | c23697e40881491ea218898bec08fb33dd7f5331 (diff) | |
parent | 0d2fc12b65028b4f04bdace3991448813130ab48 (diff) |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I94abb1fefa2943d363634a78be9523278c497256
-rw-r--r-- | dist/changes-5.14.0 | 51 | ||||
-rw-r--r-- | src/quickcontrols2/qquickstyle.cpp | 9 |
2 files changed, 58 insertions, 2 deletions
diff --git a/dist/changes-5.14.0 b/dist/changes-5.14.0 new file mode 100644 index 00000000..08e9cdbd --- /dev/null +++ b/dist/changes-5.14.0 @@ -0,0 +1,51 @@ +Qt 5.14 introduces many new features and improvements as well as bugfixes +over the 5.13.x series. 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.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +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 * +**************************************************************************** + + - ComboBox: + * Added valueRole, currentValue and indexOfValue(). These allow + convenient management of data for a role associated with the text + role. + + - QQuickMenuBar: + * Fixed issue with dynamically menu bar items not losing their highlight + when their menu was dismissed. + + - QQuickPopup: + * Fixed the issue that Popup doesn't respond to CloseOnEscape if the + initial value of visible is true + +- [QTBUG-79790] Fixed issue where font changes would result in an extra + signal being emitted. +- [QTBUG-59330] The documentation now advises against naming root resource + directories with the same name as a style name. +- [QTBUG-79302] SplitView: fix issue where Repeater items were not created. +- [QTBUG-79302] SplitView: fix cursor shape staying as Split*Cursor in some + cases. +- [QTBUG-79270] Fixed assertion failure when hiding a SplitView with only + one item. + +**************************************************************************** +* Universal * +**************************************************************************** + + - TabBar: + * Disabled wrapping. The Universal style TabBar now behaves like TabBar + from other styles. diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index 408a0de3..7a3359ef 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -119,10 +119,15 @@ static QStringList defaultImportPathList() { QStringList importPaths; importPaths.reserve(3); -#ifndef QT_STATIC +#ifdef Q_OS_ANDROID + // androiddeployqt puts the QML files inside a resource file and they are not + // showing up in the Qml2ImportsPath as a result + importPaths += QStringLiteral(":/android_rcc_bundle/qml"); +#else +# ifndef QT_STATIC importPaths += QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); +# endif #endif - importPaths += envPathList("QML2_IMPORT_PATH"); importPaths += QStringLiteral(":/qt-project.org/imports"); importPaths += QCoreApplication::applicationDirPath(); return importPaths; |