diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:00:01 +0300 |
| commit | 284057d12fea9339744ddc646aa53cfe6c3c95a1 (patch) | |
| tree | 61bb12637c56a282830d683e346057b00d332b7a /src/imports/controls/universal | |
| parent | 91b2721fdc2aba28d3c45111779fed70f7c4f87d (diff) | |
| parent | c8e9b5f25fb12c3b7983658d738165181b4d6672 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/RoundButton.qml
src/imports/controls/universal/RadioDelegate.qml
Change-Id: I4cb14c19bd5f6e19b70b03fb394c76712e6dda08
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/RadioDelegate.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/ToolSeparator.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/universal.pro | 7 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 17373e08..bc15f990 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -60,8 +60,6 @@ T.RadioDelegate { icon.height: 20 icon.color: enabled ? undefined : Color.transparent(Universal.foreground, 0.2) - property Item control - indicator: RadioIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 diff --git a/src/imports/controls/universal/ToolSeparator.qml b/src/imports/controls/universal/ToolSeparator.qml index bf82133a..965b9690 100644 --- a/src/imports/controls/universal/ToolSeparator.qml +++ b/src/imports/controls/universal/ToolSeparator.qml @@ -49,11 +49,9 @@ T.ToolSeparator { topPadding: vertical ? 12 : 16 bottomPadding: vertical ? 12 : 15 - //! [contentItem] contentItem: Rectangle { implicitWidth: vertical ? 1 : 20 implicitHeight: vertical ? 20 : 1 color: control.Universal.baseMediumLowColor } - //! [contentItem] } diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index cfbfdbfd..d9bae111 100644 --- a/src/imports/controls/universal/universal.pro +++ b/src/imports/controls/universal/universal.pro @@ -7,8 +7,11 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII +include(universal.pri) + OTHER_FILES += \ - qmldir + qmldir \ + $$QML_FILES SOURCES += \ $$PWD/qtquickcontrols2universalstyleplugin.cpp @@ -16,8 +19,6 @@ SOURCES += \ RESOURCES += \ $$PWD/qtquickcontrols2universalstyleplugin.qrc -include(universal.pri) - CONFIG += no_cxx_module load(qml_plugin) |