- Update rc packages
This commit is contained in:
parent
8f4e73873a
commit
dc005de05e
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
/qtbase-opensource-src-5.5.1.tar.xz
|
/qtbase-opensource-src-5.5.1.tar.xz
|
||||||
/qtbase-opensource-src-5.6.0-beta.tar.gz
|
/qtbase-opensource-src-5.6.0-beta.tar.gz
|
||||||
|
/qtbase-opensource-src-5.6.0-rc.tar.xz
|
||||||
|
@ -1,44 +0,0 @@
|
|||||||
From eaa3a9d0108cdf692f1686cafefb7b834f0e5af6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
|
|
||||||
Date: Fri, 1 Jan 2016 20:02:42 +0100
|
|
||||||
Subject: [PATCH 84/87] Fix crash because of NULL screen in QXcbWindow
|
|
||||||
|
|
||||||
Change-Id: If7bbe3ad1656dadcb098bcd3ece2e7b064eeb44d
|
|
||||||
Task-number: QTBUG-50081
|
|
||||||
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
|
|
||||||
---
|
|
||||||
src/gui/kernel/qwindow.cpp | 14 ++++++--------
|
|
||||||
1 file changed, 6 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
|
|
||||||
index e728d32..83e8777 100644
|
|
||||||
--- a/src/gui/kernel/qwindow.cpp
|
|
||||||
+++ b/src/gui/kernel/qwindow.cpp
|
|
||||||
@@ -609,18 +609,16 @@ void QWindow::setParent(QWindow *parent)
|
|
||||||
}
|
|
||||||
|
|
||||||
QObject::setParent(parent);
|
|
||||||
- if (parent)
|
|
||||||
+
|
|
||||||
+ QPlatformWindow *parentPlatformWindow = parent ? parent->d_func()->platformWindow : Q_NULLPTR;
|
|
||||||
+
|
|
||||||
+ if (parentPlatformWindow)
|
|
||||||
d->disconnectFromScreen();
|
|
||||||
else
|
|
||||||
d->connectToScreen(newScreen);
|
|
||||||
|
|
||||||
- if (d->platformWindow) {
|
|
||||||
- if (parent && parent->d_func()->platformWindow) {
|
|
||||||
- d->platformWindow->setParent(parent->d_func()->platformWindow);
|
|
||||||
- } else {
|
|
||||||
- d->platformWindow->setParent(0);
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
+ if (d->platformWindow)
|
|
||||||
+ d->platformWindow->setParent(parentPlatformWindow);
|
|
||||||
|
|
||||||
d->parentWindow = parent;
|
|
||||||
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
@ -39,20 +39,20 @@
|
|||||||
|
|
||||||
%define examples 1
|
%define examples 1
|
||||||
|
|
||||||
%define prerelease beta
|
%define prerelease rc
|
||||||
|
|
||||||
Summary: Qt5 - QtBase components
|
Summary: Qt5 - QtBase components
|
||||||
Name: qt5-qtbase
|
Name: qt5-qtbase
|
||||||
Version: 5.6.0
|
Version: 5.6.0
|
||||||
Release: 0.25.%{prerelease}%{?dist}
|
Release: 0.26.%{prerelease}%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
Url: http://qt-project.org/
|
Url: http://qt-project.org/
|
||||||
%if 0%{?prerelease:1}
|
%if 0%{?prerelease:1}
|
||||||
Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}-%{prerelease}.tar.gz
|
Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}-%{prerelease}.tar.xz
|
||||||
%else
|
%else
|
||||||
Source0: http://download.qt.io/official_releases/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz
|
Source0: http://download.qt.io/official_releases/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# header file to workaround multilib issue
|
# header file to workaround multilib issue
|
||||||
@ -95,10 +95,6 @@ Patch54: qtbase-opensource-src-5.6.0-arm.patch
|
|||||||
# https://codereview.qt-project.org/126102/
|
# https://codereview.qt-project.org/126102/
|
||||||
Patch150: moc-get-the-system-defines-from-the-compiler-itself.patch
|
Patch150: moc-get-the-system-defines-from-the-compiler-itself.patch
|
||||||
|
|
||||||
# https://bugreports.qt.io/browse/QTBUG-50081
|
|
||||||
# https://codereview.qt-project.org/#/c/144896/
|
|
||||||
Patch184: 0084-Fix-crash-because-of-NULL-screen-in-QXcbWindow.patch
|
|
||||||
|
|
||||||
# macros, be mindful to keep sync'd with macros.qt5
|
# macros, be mindful to keep sync'd with macros.qt5
|
||||||
Source10: macros.qt5
|
Source10: macros.qt5
|
||||||
%define _qt5 %{name}
|
%define _qt5 %{name}
|
||||||
@ -343,7 +339,6 @@ RPM macros for building Qt5 packages.
|
|||||||
%patch54 -p1 -b .arm
|
%patch54 -p1 -b .arm
|
||||||
|
|
||||||
%patch150 -p1 -b .moc_system_defines
|
%patch150 -p1 -b .moc_system_defines
|
||||||
%patch184 -p1 -b .0084
|
|
||||||
|
|
||||||
## adjust $RPM_OPT_FLAGS
|
## adjust $RPM_OPT_FLAGS
|
||||||
# remove -fexceptions
|
# remove -fexceptions
|
||||||
@ -930,6 +925,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.26.rc
|
||||||
|
- Integrate rc releases now.
|
||||||
|
|
||||||
* Sat Feb 13 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.25.beta
|
* Sat Feb 13 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.25.beta
|
||||||
- macros.qt5: fix %%qt5_ldflags macro
|
- macros.qt5: fix %%qt5_ldflags macro
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user