diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
| commit | efa04c2ae8427c70848477ace3d8f6e82baaab11 (patch) | |
| tree | c0394c9cd5ce51961337a7a15e169074dd41632b /src/imports/controls/universal/ScrollIndicator.qml | |
| parent | 9c7429219d36e8eb40e1fe6e679715c89209fc40 (diff) | |
| parent | 6476de0b669162cf08c11f5c8d5ad0b42419f365 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
Diffstat (limited to 'src/imports/controls/universal/ScrollIndicator.qml')
| -rw-r--r-- | src/imports/controls/universal/ScrollIndicator.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml index b2dd6bbd..ab66ee7c 100644 --- a/src/imports/controls/universal/ScrollIndicator.qml +++ b/src/imports/controls/universal/ScrollIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ScrollIndicator { id: control |