Accepting request 310367 from KDE:Qt5

Update to 5.4.2

OBS-URL: https://build.opensuse.org/request/show/310367
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2015-06-06 07:50:50 +00:00 committed by Git OBS Bridge
parent 496a1fa8e0
commit a40bfd5e20
5 changed files with 17 additions and 10 deletions

View File

@ -25,9 +25,9 @@ diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 8ac5a1e..c19841f 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -340,24 +340,15 @@ void QQuickScreenAttached::screenChanged(QScreen *screen)
screen->setOrientationUpdateMask(m_updateMask);
@@ -347,24 +347,15 @@ void QQuickScreenAttached::screenChanged
emit orientationUpdateMaskChanged();
}
- if (!oldScreen || screen->size() != oldScreen->size()) {
- emit widthChanged();

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 3 22:56:20 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.4.2
* Bugfix release, for more details please see:
http://blog.qt.io/blog/2015/06/02/qt-5-4-2-released/
-------------------------------------------------------------------
Mon Apr 27 18:14:35 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtdeclarative
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -21,15 +21,15 @@
%define libname libQtQuick5
Name: libqt5-qtdeclarative
Version: 5.4.1
Version: 5.4.2
Release: 0
Summary: Qt 5 Declarative Library
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.4.1
%define so_version 5.4.1
%define real_version 5.4.2
%define so_version 5.4.2
%define tar_version qtdeclarative-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source1: baselibs.conf

View File

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

View File

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