diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-31 03:02:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-31 03:02:06 +0200 |
| commit | a69544a7b444301c1d3f7956c89eb65ea0b3ab83 (patch) | |
| tree | 979de669a8c29a92337c358f42fe29b36bc5c2b4 /src | |
| parent | 0f3d4118e607a6b8b4d1090489a2277f33019a05 (diff) | |
| parent | e9ad3352df0815761c1fde8ea36b040e8431f360 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ie8fd52e91dd0ee6ba504095ba2aec0866046f6c3
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/TreeView.qml | 8 | ||||
| -rw-r--r-- | src/controls/doc/src/qtquickcontrolsstyles-index.qdoc | 4 | ||||
| -rw-r--r-- | src/dialogs/qquickdialog.cpp | 2 | ||||
| -rw-r--r-- | src/extras/Styles/Flat/qquicktexthandle.cpp | 3 |
4 files changed, 14 insertions, 3 deletions
diff --git a/src/controls/TreeView.qml b/src/controls/TreeView.qml index 6a38acff5..2bedb9e64 100644 --- a/src/controls/TreeView.qml +++ b/src/controls/TreeView.qml @@ -49,7 +49,7 @@ BasicTableView { property var model: null property alias rootIndex: modelAdaptor.rootIndex - readonly property var currentIndex: modelAdaptor.mapRowToModelIndex(__currentRow) + readonly property var currentIndex: modelAdaptor.updateCount, modelAdaptor.mapRowToModelIndex(__currentRow) property ItemSelectionModel selection: null signal activated(var index) @@ -96,6 +96,12 @@ BasicTableView { id: modelAdaptor model: root.model + // Hack to force re-evaluation of the currentIndex binding + property int updateCount: 0 + onModelReset: updateCount++ + onRowsInserted: updateCount++ + onRowsRemoved: updateCount++ + onExpanded: root.expanded(index) onCollapsed: root.collapsed(index) } diff --git a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc index 9333ee271..c86488faa 100644 --- a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc +++ b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc @@ -60,7 +60,7 @@ \title Qt Quick Controls 1 Styles \brief The Qt Quick Controls Styles submodule provides custom styles for Qt Quick Controls. - \deprecation-warning + \deprecationwarning The Qt Quick Controls Styles submodule allows custom styling for \l {Qt Quick Controls 1}. @@ -132,7 +132,7 @@ \ingroup qmlmodules \brief Provides QML types for Qt Quick Controls styles. - \deprecation-warning + \deprecationwarning The \l{Qt Quick Controls 1} module provides a set of QML types for handling styles. diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index 4ccc0f9d7..eeb9cda84 100644 --- a/src/dialogs/qquickdialog.cpp +++ b/src/dialogs/qquickdialog.cpp @@ -56,6 +56,8 @@ QT_BEGIN_NAMESPACE The purpose of Dialog is to wrap arbitrary content into a \e {dialog window} including a row of platform-tailored buttons. + \note On Android, it is recommended to use \l {QQuickDialog}{Qt Quick Controls 2 Dialog}. + The \l contentItem is the default property (the only allowed child element), and items declared inside the Dialog will actually be children of another Item inside the \c contentItem. The row of \l standardButtons will diff --git a/src/extras/Styles/Flat/qquicktexthandle.cpp b/src/extras/Styles/Flat/qquicktexthandle.cpp index 60393e9e3..41854292d 100644 --- a/src/extras/Styles/Flat/qquicktexthandle.cpp +++ b/src/extras/Styles/Flat/qquicktexthandle.cpp @@ -38,6 +38,9 @@ ****************************************************************************/ #include "qquicktexthandle.h" +#include <QPainterPath> + +#include <QPainterPath> #include <QtGui/qpainterpath.h> |