From 3c7bfc156797b2f3ef08a8cf620b79da80e4b061 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 23 Oct 2018 15:23:58 +0200 Subject: Tie minor version of all imports to Qt's minor version This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann Reviewed-by: Shawn Rutledge --- src/imports/controls/fusion/ComboBox.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/imports/controls/fusion/ComboBox.qml') diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml index cafbdb02..012dbbd0 100644 --- a/src/imports/controls/fusion/ComboBox.qml +++ b/src/imports/controls/fusion/ComboBox.qml @@ -35,12 +35,12 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Window 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ComboBox { id: control -- cgit v1.2.3 From b943bbf91162ba8aad4a6c3b0c7ca2e944a26105 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 13 Nov 2018 16:11:48 +0100 Subject: Make it visually clear which ComboBox item is the current item Do as the Default style does and make the current item bold. If we don't do this, it can be impossible to distinguish the current item from the highlighted item, especially when the popup obscures the button. Change-Id: If40b9c73c207d07fb5669564cdcfcea29ebed2f1 Fixes: QTBUG-68794 Reviewed-by: Nils Jeisecke Reviewed-by: Frederik Gladhorn --- src/imports/controls/fusion/ComboBox.qml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/imports/controls/fusion/ComboBox.qml') diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml index 012dbbd0..3ecb0cf2 100644 --- a/src/imports/controls/fusion/ComboBox.qml +++ b/src/imports/controls/fusion/ComboBox.qml @@ -57,6 +57,7 @@ T.ComboBox { delegate: MenuItem { width: parent.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData + font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled } -- cgit v1.2.3