diff --git a/examples/applets/testtheme/contents/ui/FontGizmo.qml b/examples/applets/testtheme/contents/ui/FontGizmo.qml --- a/examples/applets/testtheme/contents/ui/FontGizmo.qml +++ b/examples/applets/testtheme/contents/ui/FontGizmo.qml @@ -18,14 +18,16 @@ import QtQuick 2.1 +import QtQuick.Controls.Private 1.0 as QtQuickControlsPrivate + import org.kde.plasma.core 2.0 as PlasmaCore //import org.kde.plasma.components 2.0 as PlasmaComponents //import org.kde.plasma.extras 2.0 as PlasmaExtras //import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons Text { - renderType: Text.NativeRendering + renderType: QtQuickControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering font.pointSize: 22 //font.family: theme.defaultFont.family diff --git a/src/declarativeimports/plasmacomponents/qml/Label.qml b/src/declarativeimports/plasmacomponents/qml/Label.qml --- a/src/declarativeimports/plasmacomponents/qml/Label.qml +++ b/src/declarativeimports/plasmacomponents/qml/Label.qml @@ -18,6 +18,7 @@ */ import QtQuick 2.1 +import QtQuick.Controls.Private 1.0 as QtQuickControlsPrivate import org.kde.plasma.core 2.0 as PlasmaCore /** @@ -39,7 +40,7 @@ verticalAlignment: lineCount > 1 ? Text.AlignTop : Text.AlignVCenter activeFocusOnTab: false - renderType: Text.NativeRendering + renderType: QtQuickControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering font.capitalization: theme.defaultFont.capitalization font.family: theme.defaultFont.family diff --git a/src/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml b/src/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml --- a/src/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml +++ b/src/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml @@ -18,6 +18,7 @@ */ import QtQuick 2.1 +import QtQuick.Controls.Private 1.0 as QtQuickControlsPrivate import org.kde.plasma.core 2.0 as PlasmaCore /** @@ -93,7 +94,7 @@ id: label text: dualButton.text - renderType: Text.NativeRendering + renderType: QtQuickControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering anchors { top: parent.top bottom: parent.bottom diff --git a/src/declarativeimports/plasmastyle/SpinBoxStyle.qml b/src/declarativeimports/plasmastyle/SpinBoxStyle.qml --- a/src/declarativeimports/plasmastyle/SpinBoxStyle.qml +++ b/src/declarativeimports/plasmastyle/SpinBoxStyle.qml @@ -20,6 +20,7 @@ import QtQuick 2.0 import QtQuick.Controls.Styles 1.1 as QtQuickControlStyle +import QtQuick.Controls.Private 1.0 as QtQuickControlsPrivate import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore @@ -38,7 +39,7 @@ selectedTextColor: theme.viewBackgroundColor - renderType: Text.NativeRendering + renderType: QtQuickControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering PlasmaCore.Svg { id: arrowSvg diff --git a/src/declarativeimports/plasmastyle/TextAreaStyle.qml b/src/declarativeimports/plasmastyle/TextAreaStyle.qml --- a/src/declarativeimports/plasmastyle/TextAreaStyle.qml +++ b/src/declarativeimports/plasmastyle/TextAreaStyle.qml @@ -41,7 +41,7 @@ selectionColor: control.backgroundVisible ? theme.viewFocusColor : PlasmaCore.ColorScope.highlightColor selectedTextColor: control.backgroundVisible ? theme.viewHighlightedTextColor : PlasmaCore.ColorScope.highlightedTextColor - renderType: Text.NativeRendering + renderType: QtQuickControlsPrivate.Settings.isMobile ? Text.QtRendering : Text.NativeRendering frame: PlasmaCore.FrameSvgItem { id: base diff --git a/src/declarativeimports/plasmastyle/TextFieldStyle.qml b/src/declarativeimports/plasmastyle/TextFieldStyle.qml --- a/src/declarativeimports/plasmastyle/TextFieldStyle.qml +++ b/src/declarativeimports/plasmastyle/TextFieldStyle.qml @@ -38,8 +38,9 @@ * Since the password echo is a circle woithout vertical or horizontal lines, it won't be * more blurred with different rendring types. * Using Qt rendering, the dots will look more aligned and equally spaced. + * Also if we are on mobile, make sure we use QtRendering */ - renderType: control.echoMode == TextInput.Normal ? Text.NativeRendering : Text.QtRendering + renderType: !QtQuickControlsPrivate.Settings.isMobile && control.echoMode == TextInput.Normal ? Text.NativeRendering : Text.QtRendering background: Item { //QQC button heights are max(backgroundHeight, label + margins).