From b1ea82e473324ddba0ab2ed2e5e4993b17625436 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 21 Dec 2016 12:59:47 +0100 Subject: Doc: fix linking error to "Qt for OS X/macOS" Change-Id: I285ea1b331314c7b3927d7f8ab9f2c367e73ede5 Reviewed-by: Mitch Curtis --- src/imports/platform/qquickplatformmenuitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports') diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp index 9f261d24..9ee5373a 100644 --- a/src/imports/platform/qquickplatformmenuitem.cpp +++ b/src/imports/platform/qquickplatformmenuitem.cpp @@ -403,7 +403,7 @@ void QQuickPlatformMenuItem::setChecked(bool checked) \value MenuItem.AboutQtRole The item handles the "About Qt" menu item. \value MenuItem.AboutRole The item should be placed where the "About" menu item is in the application menu. The text of the menu item will be set to "About ". The application name is fetched from the - \c{Info.plist} file in the application's bundle (See \l{Qt for OS X - Deployment}). + \c{Info.plist} file in the application's bundle (See \l{Qt for macOS - Deployment}). \value MenuItem.PreferencesRole The item should be placed where the "Preferences..." menu item is in the application menu. \value MenuItem.QuitRole The item should be placed where the Quit menu item is in the application menu. -- cgit v1.2.3 From c724855ce938832e68f00627b69bae5b2d4c35be Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Wed, 5 Oct 2016 14:43:08 +0400 Subject: Bump style plugin dependencies to QtQuick.Controls 2.1 Change-Id: I316ec8deab791c0e8ebf0bbb9bb1a07e8aacad6b Reviewed-by: J-P Nurmi --- src/imports/controls/material/qmldir | 2 +- src/imports/controls/qmldir | 2 +- src/imports/controls/universal/qmldir | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/imports') diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir index 6125e67d..27d1298a 100644 --- a/src/imports/controls/material/qmldir +++ b/src/imports/controls/material/qmldir @@ -1,4 +1,4 @@ module QtQuick.Controls.Material plugin qtquickcontrols2materialstyleplugin classname QtQuickControls2MaterialStylePlugin -depends QtQuick.Controls 2.0 +depends QtQuick.Controls 2.1 diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir index 50f786d7..8e5cca4f 100644 --- a/src/imports/controls/qmldir +++ b/src/imports/controls/qmldir @@ -1,5 +1,5 @@ module QtQuick.Controls plugin qtquickcontrols2plugin classname QtQuickControls2Plugin -depends QtQuick.Templates 2.0 +depends QtQuick.Templates 2.1 designersupported diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir index e4b804a6..1dde3a02 100644 --- a/src/imports/controls/universal/qmldir +++ b/src/imports/controls/universal/qmldir @@ -1,4 +1,4 @@ module QtQuick.Controls.Universal plugin qtquickcontrols2universalstyleplugin classname QtQuickControls2UniversalStylePlugin -depends QtQuick.Controls 2.0 +depends QtQuick.Controls 2.1 -- cgit v1.2.3 From a02f6fd987defb084aa1ee0f70fbe5014957fd8b Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Wed, 5 Oct 2016 14:43:08 +0400 Subject: Material: set default ToolBar's spacing to 16 According to the Material design guidelines, it is an appropriate spacing value for most use cases Change-Id: Ie72c63b3ca2e1a5b7457a38b460cf2bc4acbecb2 Reviewed-by: J-P Nurmi --- src/imports/controls/material/ToolBar.qml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/imports') diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index 38acf43e..353ee61f 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -52,6 +52,8 @@ T.ToolBar { Material.foreground: Material.toolTextColor + spacing: 16 + background: Rectangle { implicitHeight: 48 color: control.Material.toolBarColor -- cgit v1.2.3 From 8959daf190bbb3552f6a23bb66142c6b6fe65c63 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 26 Dec 2016 11:42:49 +0400 Subject: Material: Optimize "check" icon images Size decrease: 7630 -> 6614 (bytes) Change-Id: I14eefbb60e0246dd260977acb01a79e4fb4c9584 Reviewed-by: J-P Nurmi --- src/imports/controls/material/images/check@2x.png | Bin 1526 -> 1347 bytes src/imports/controls/material/images/check@3x.png | Bin 2341 -> 1982 bytes src/imports/controls/material/images/check@4x.png | Bin 3058 -> 2580 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/imports') diff --git a/src/imports/controls/material/images/check@2x.png b/src/imports/controls/material/images/check@2x.png index 744f80b5..deb0c7e9 100644 Binary files a/src/imports/controls/material/images/check@2x.png and b/src/imports/controls/material/images/check@2x.png differ diff --git a/src/imports/controls/material/images/check@3x.png b/src/imports/controls/material/images/check@3x.png index dbf12b6d..72ffd4e6 100644 Binary files a/src/imports/controls/material/images/check@3x.png and b/src/imports/controls/material/images/check@3x.png differ diff --git a/src/imports/controls/material/images/check@4x.png b/src/imports/controls/material/images/check@4x.png index 764dd7ee..9dc1ab2c 100644 Binary files a/src/imports/controls/material/images/check@4x.png and b/src/imports/controls/material/images/check@4x.png differ -- cgit v1.2.3 From 00a7dfd16d4484064bd0e5601720993d0525995a Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 26 Dec 2016 11:44:07 +0400 Subject: Material|SpinBox: Fix trivial C&P typo Change-Id: I8bdd973f69ae246220b58a312f5d82d9134f35f6 Reviewed-by: J-P Nurmi --- src/imports/controls/material/SpinBox.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/imports') diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index 110032be..8a3b0932 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -125,7 +125,7 @@ T.SpinBox { Rectangle { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - width: Math.min(parent.width / 3, parent.width / 3) + width: Math.min(parent.width / 3, parent.height / 3) height: 2 color: enabled ? control.Material.foreground : control.Material.spinBoxDisabledIconColor } @@ -133,7 +133,7 @@ T.SpinBox { x: (parent.width - width) / 2 y: (parent.height - height) / 2 width: 2 - height: Math.min(parent.width / 3, parent.width / 3) + height: Math.min(parent.width / 3, parent.height / 3) color: enabled ? control.Material.foreground : control.Material.spinBoxDisabledIconColor } } -- cgit v1.2.3