[SCM] qtquickcontrols packaging branch, kubuntu_vivid_mobile, updated. debian/5.5.1-2-1-g2336536
Bhushan Shah
bshah-guest at moszumanska.debian.org
Mon Nov 30 15:32:11 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtquickcontrols.git;a=commitdiff;h=2336536
The following commit has been merged in the kubuntu_vivid_mobile branch:
commit 23365367a2561b71f0192519a46206bf190231da
Author: Bhushan Shah <bshah at kde.org>
Date: Mon Nov 30 20:58:24 2015 +0530
Patches from mobile CI
---
debian/changelog | 6 ++
...-allow-any-platform-to-have-ismobile-true.patch | 52 ++++++++++++++
...-allow-for-styles-to-provide-own-editmenu.patch | 83 ++++++++++++++++++++++
debian/patches/series | 2 +
4 files changed, 143 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 34281af..740ea53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtquickcontrols-opensource-src (5.5.1-2+mci1) UNRELEASED; urgency=medium
+
+ * Patches for mobile
+
+ -- Bhushan Shah <bshah at kde.org> Mon, 30 Nov 2015 20:44:42 +0530
+
qtquickcontrols-opensource-src (5.5.1-2) unstable; urgency=medium
* Upload to unstable.
diff --git a/debian/patches/kubuntu-allow-any-platform-to-have-ismobile-true.patch b/debian/patches/kubuntu-allow-any-platform-to-have-ismobile-true.patch
new file mode 100644
index 0000000..46c7605
--- /dev/null
+++ b/debian/patches/kubuntu-allow-any-platform-to-have-ismobile-true.patch
@@ -0,0 +1,52 @@
+From 560fa0b9ec9ac0af53baf717ff83a51f1cd0762b Mon Sep 17 00:00:00 2001
+From: Marco Martin <mart at kde.org>
+Date: Fri, 17 Jul 2015 10:59:15 +0200
+Subject: [PATCH] Allow any platform to have isMobile true
+
+don't hardcode the isMobile property of the controls settings.
+Allow other platforms such as plain Linux or Windows to behave as full
+mobile controls using the QT_QUICK_CONTROLS_MOBILE environmant variable
+
+[ChangeLog][QtQuick.Controls] introducing QT_QUICK_CONTROLS_MOBILE
+makes possible for normal Linux systems to have QtQuickControls
+behaving as a mobile platform
+
+Change-Id: I4c96104334864855e9cf0a8f71125102f178b423
+Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich at theqtcompany.com>
+---
+ src/controls/Private/qquickcontrolsettings.cpp | 3 +++
+ src/controls/doc/src/qtquickcontrols-overview.qdoc | 4 ++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
+index faebdaa..7e6393a 100644
+--- a/src/controls/Private/qquickcontrolsettings.cpp
++++ b/src/controls/Private/qquickcontrolsettings.cpp
+@@ -97,6 +97,9 @@ bool QQuickControlSettings::isMobile() const
+ #if defined(Q_OS_IOS) || defined(Q_OS_ANDROID) || defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) || defined(Q_OS_WINRT)
+ return true;
+ #else
++ if (qEnvironmentVariableIsSet("QT_QUICK_CONTROLS_MOBILE")) {
++ return true;
++ }
+ return false;
+ #endif
+ }
+diff --git a/src/controls/doc/src/qtquickcontrols-overview.qdoc b/src/controls/doc/src/qtquickcontrols-overview.qdoc
+index 45a4557..f549d0c 100644
+--- a/src/controls/doc/src/qtquickcontrols-overview.qdoc
++++ b/src/controls/doc/src/qtquickcontrols-overview.qdoc
+@@ -126,6 +126,10 @@
+ forgotten. This is a known limitation and a workaround is to add potentially missing imports in
+ one of the qml files of the application using the controls.
+
++ \section2 Testing Desktop and Mobile behavior of the controls
++ You can test how the controls on your application or style will behave on
++ a mobile platform by setting the environment variable \e QT_QUICK_CONTROLS_MOBILE, to force a behavior optimized for mobile devices.
++
+ \section1 Related information
+
+ \list
+--
+2.6.2
+
diff --git a/debian/patches/kubuntu-allow-for-styles-to-provide-own-editmenu.patch b/debian/patches/kubuntu-allow-for-styles-to-provide-own-editmenu.patch
new file mode 100644
index 0000000..2a46bdc
--- /dev/null
+++ b/debian/patches/kubuntu-allow-for-styles-to-provide-own-editmenu.patch
@@ -0,0 +1,83 @@
+From 966a053e7689f41807d8994a93d5fd3952e09932 Mon Sep 17 00:00:00 2001
+From: Marco Martin <mart at kde.org>
+Date: Thu, 6 Aug 2015 14:03:59 +0200
+Subject: [PATCH] Allow for styles to provide own EditMenu
+
+Allow for styles to define their own EditMenu component, to provide
+cut/copy/paste actions with the platform style.
+In order to be able to provide mobile-optimized controls on Linux
+systems, use the boolean env var QT_MOBILE_PLATFORM in this case.
+This allows on a plain Linux system to offer controls with the
+touch friendly text selection handles and the little inline
+cut/copy/paste menu
+
+Change-Id: Id9013b4386423938735390325a003fcccdcfd598
+Reviewed-by: Richard Moe Gustavsen <richard.gustavsen at theqtcompany.com>
+---
+ src/controls/Private/EditMenu.qml | 13 ++++++++++---
+ src/controls/Styles/Base/TextAreaStyle.qml | 6 ++++++
+ src/controls/Styles/Base/TextFieldStyle.qml | 6 ++++++
+ 3 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/src/controls/Private/EditMenu.qml b/src/controls/Private/EditMenu.qml
+index 51abe75..dc3ba64 100644
+--- a/src/controls/Private/EditMenu.qml
++++ b/src/controls/Private/EditMenu.qml
+@@ -45,7 +45,7 @@ Loader {
+ property Item selectionHandle
+ property Flickable flickable
+ property Component defaultMenu: item && item.defaultMenu ? item.defaultMenu : null
+- property Menu menuInstance: null
++ property QtObject menuInstance: null
+ property MouseArea mouseArea
+
+ Connections {
+@@ -67,6 +67,13 @@ Loader {
+ return menuInstance;
+ }
+
+- source: Qt.resolvedUrl(Qt.platform.os === "ios" ? "EditMenu_ios.qml"
+- : Qt.platform.os === "android" ? "" : "EditMenu_base.qml")
++ Component.onCompleted: {
++ if (__style.__editMenu) {
++ sourceComponent = __style.__editMenu;
++ } else {
++ // todo: get ios/android/base menus from style as well
++ source = (Qt.resolvedUrl(Qt.platform.os === "ios" ? "EditMenu_ios.qml"
++ : Qt.platform.os === "android" ? "" : "EditMenu_base.qml"));
++ }
++ }
+ }
+diff --git a/src/controls/Styles/Base/TextAreaStyle.qml b/src/controls/Styles/Base/TextAreaStyle.qml
+index 678d365..1da5222 100644
+--- a/src/controls/Styles/Base/TextAreaStyle.qml
++++ b/src/controls/Styles/Base/TextAreaStyle.qml
+@@ -146,4 +146,10 @@ ScrollViewStyle {
+ \since QtQuick.Controls.Styles 1.3
+ */
+ property Component __cursorDelegate
++
++ /*! \internal
++ The delegate for the cut/copy/paste menu.
++ \since QtQuick.Controls.Styles 1.4
++ */
++ property Component __editMenu
+ }
+diff --git a/src/controls/Styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml
+index e924741..b5e024b 100644
+--- a/src/controls/Styles/Base/TextFieldStyle.qml
++++ b/src/controls/Styles/Base/TextFieldStyle.qml
+@@ -209,4 +209,10 @@ Style {
+ \since QtQuick.Controls.Styles 1.3
+ */
+ property Component __cursorDelegate
++
++ /*! \internal
++ The delegate for the cut/copy/paste menu.
++ \since QtQuick.Controls.Styles 1.4
++ */
++ property Component __editMenu
+ }
+--
+2.6.2
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..731b779
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+kubuntu-allow-any-platform-to-have-ismobile-true.patch
+kubuntu-allow-for-styles-to-provide-own-editmenu.patch
--
qtquickcontrols packaging
More information about the pkg-kde-commits
mailing list