Accepting request 264864 from KDE:Qt5

Update to 5.4.0

OBS-URL: https://build.opensuse.org/request/show/264864
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtquickcontrols?expand=0&rev=16

0001-Correct-sizing-of-combobox-items.patch

@@ -1,57 +0,0 @@
-From 4d9753fd68fb91b4a839e546553b751a455a9818 Mon Sep 17 00:00:00 2001
-From: Marco Martin <mart@kde.org>
-Date: Mon, 27 Oct 2014 17:24:11 +0100
-Subject: [PATCH 1/1] Correct sizing of combobox items
-
-The qstyle can set as preferred size for itemview items a different
-size than the text height depending from the result of
-sizeFromContents( CT_ItemViewItem, ..
-
-Examples of styles that do this, are Oxygen and Breeze,
-in order to have a bit more spacing.
-This makes the combobox render incorrectly.
-
-This patch makes use of the size hint of the qstyle instead of the
-text height. Since the height can be more than the font height,
-the text (and optional icon) are now drawn vertically centered
-in the delegate.
-
-Change-Id: I898d85c994d5760979750c2f3a5dafd83f1e3cbd
-Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-(cherry picked from commit 04ec29f8b3abea2297a1f5c033bef49ba0405c34)
----
- src/controls/Private/qquickstyleitem.cpp      | 2 ++
- src/controls/Styles/Desktop/ComboBoxStyle.qml | 4 ++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
-index 4da6773afa94bf9725162566ee3aeb89d0b251e7..e810e473245f37e7b950c808294b39e8e55f2e12 100644
---- a/src/controls/Private/qquickstyleitem.cpp
-+++ b/src/controls/Private/qquickstyleitem.cpp
-@@ -334,6 +334,8 @@ void QQuickStyleItem::initStyleOption()
-         opt->features = QStyleOptionViewItem::HasDisplay;
-         opt->text = text();
-         opt->textElideMode = Qt::ElideRight;
-+        opt->displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
-+        opt->decorationAlignment = Qt::AlignCenter;
-         resolvePalette();
-         needsResolvePalette = false;
-         QPalette pal = m_styleoption->palette;
-diff --git a/src/controls/Styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml
-index 9c8bf608a7f14e529ef1395aca0278bb0f481ee8..a13d80533c64c66c425608ec0ca13d212c1f10aa 100644
---- a/src/controls/Styles/Desktop/ComboBoxStyle.qml
-+++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml
-@@ -105,8 +105,8 @@ Style {
-             elementType: "itemrow"
-             selected: styleData.selected
- 
--            implicitWidth: textItem.contentWidth
--            implicitHeight: textItem.contentHeight
-+            implicitWidth: textItem.implicitWidth
-+            implicitHeight: textItem.implicitHeight
- 
-             StyleItem {
-                 id: textItem
--- 
-2.1.2
-

libqt5-qtquickcontrols.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Dec 10 11:00:09 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.4 Final
+  * For more details please see:
+    http://blog.qt.digia.com/blog/2014/12/10/qt-5-4-released/
+    and http://qt-project.org/wiki/New-Features-in-Qt-5.4
+
+-------------------------------------------------------------------
+Thu Nov 27 15:58:45 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.4 RC
+  * For more details please see:
+    http://blog.qt.digia.com/blog/2014/11/27/qt-5-4-release-candidate-available/
+    and http://qt-project.org/wiki/New-Features-in-Qt-5.4
+- Drop 0001-Correct-sizing-of-combobox-items.patch, merged upstream
+
 -------------------------------------------------------------------
 Tue Nov  4 18:42:04 UTC 2014 - hrvoje.senjan@gmail.com
 

libqt5-qtquickcontrols.spec

@@ -19,19 +19,17 @@
 %define qt5_snapshot 0
 
 Name:           libqt5-qtquickcontrols
-Version:        5.3.2
+Version:        5.4.0
 Release:        0
 Summary:        Qt 5 Quick Controls Addon
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
 Group:          Development/Libraries/X11
 Url:            http://qt.digia.com
 %define base_name libqt5
-%define real_version 5.3.2
+%define real_version 5.4.0
-%define so_version 5.3.2
+%define so_version 5.4.0
 %define tar_version qtquickcontrols-opensource-src-%{real_version}
 Source:         %{tar_version}.tar.xz
-# PATCH-FIX-UPSTREAM 0001-Correct-sizing-of-combobox-items.patch
-Patch0:         0001-Correct-sizing-of-combobox-items.patch
 BuildRequires:  fdupes
 BuildRequires:  libQt5Core-private-headers-devel >= %{version}
 BuildRequires:  libQt5Gui-private-headers-devel >= %{version}
@@ -59,7 +57,6 @@ Examples for libqt5-qtquickcontrols module.
 
 %prep
 %setup -q -n qtquickcontrols-opensource-src-%{real_version}
-%patch0 -p1
 
 %build
 %if %qt5_snapshot
@@ -74,12 +71,12 @@ mkdir .git
 
 %files
 %defattr(-,root,root,755)
-%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
+%doc LGPL_EXCEPTION.txt LICENSE.*
 %{_libqt5_archdatadir}/qml/QtQuick
 
 %files examples
 %defattr(-,root,root,755)
-%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
+%doc LGPL_EXCEPTION.txt LICENSE.*
 %{_libqt5_examplesdir}/
 
 %changelog

qtquickcontrols-opensource-src-5.3.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f890f014d087141b0aaa8954b21b1f85740233b60a556e0e9624227bff6d94e
-size 857000

qtquickcontrols-opensource-src-5.4.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b59f43333291c3e73f9a9f92706a4c98d4d810b4efd6803a4edd3f1658fae61e
+size 919408