qt-5.5 segfault on QFileDialog without parent (#1291003)
This commit is contained in:
parent
2f26eae065
commit
21748c29f1
17
138201.patch
17
138201.patch
@ -1,14 +1,6 @@
|
|||||||
diff -rupN qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/qxcbconnection.cpp qtbase-opensource-src-5.5.1-new/src/plugins/platforms/xcb/qxcbconnection.cpp
|
diff -rupN qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/qxcbconnection.cpp qtbase-opensource-src-5.5.1-new/src/plugins/platforms/xcb/qxcbconnection.cpp
|
||||||
--- qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/qxcbconnection.cpp 2015-10-13 06:35:27.000000000 +0200
|
--- qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/qxcbconnection.cpp 2015-10-13 06:35:27.000000000 +0200
|
||||||
+++ qtbase-opensource-src-5.5.1-new/src/plugins/platforms/xcb/qxcbconnection.cpp 2015-10-21 21:02:53.056198256 +0200
|
+++ qtbase-opensource-src-5.5.1-new/src/plugins/platforms/xcb/qxcbconnection.cpp 2015-10-21 21:02:53.056198256 +0200
|
||||||
@@ -229,7 +229,6 @@ void QXcbConnection::updateScreens(const
|
|
||||||
if (screen->mode() != crtc.mode)
|
|
||||||
screen->updateRefreshRate(crtc.mode);
|
|
||||||
}
|
|
||||||
-
|
|
||||||
} else if (event->subCode == XCB_RANDR_NOTIFY_OUTPUT_CHANGE) {
|
|
||||||
xcb_randr_output_change_t output = event->u.oc;
|
|
||||||
QXcbVirtualDesktop *virtualDesktop = virtualDesktopForRootWindow(output.window);
|
|
||||||
@@ -242,20 +241,18 @@ void QXcbConnection::updateScreens(const
|
@@ -242,20 +241,18 @@ void QXcbConnection::updateScreens(const
|
||||||
|
|
||||||
if (screen && output.connection == XCB_RANDR_CONNECTION_DISCONNECTED) {
|
if (screen && output.connection == XCB_RANDR_CONNECTION_DISCONNECTED) {
|
||||||
@ -318,15 +310,6 @@ diff -rupN qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/qxcbwindow.cpp
|
|||||||
Q_XCB_CALL(xcb_send_event(xcb_connection(), 0, xcbScreen()->root(), XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (const char *)&event));
|
Q_XCB_CALL(xcb_send_event(xcb_connection(), 0, xcbScreen()->root(), XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (const char *)&event));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1493,8 +1496,6 @@ void QXcbWindow::setParent(const QPlatfo
|
|
||||||
xcb_parent_id = qXcbParent->xcb_window();
|
|
||||||
m_embedded = qXcbParent->window()->type() == Qt::ForeignWindow;
|
|
||||||
} else {
|
|
||||||
- if (!xcbScreen())
|
|
||||||
- return;
|
|
||||||
xcb_parent_id = xcbScreen()->root();
|
|
||||||
m_embedded = false;
|
|
||||||
}
|
|
||||||
@@ -2323,8 +2324,6 @@ void QXcbWindow::handleEnterNotifyEvent(
|
@@ -2323,8 +2324,6 @@ void QXcbWindow::handleEnterNotifyEvent(
|
||||||
|
|
||||||
const int dpr = int(devicePixelRatio());
|
const int dpr = int(devicePixelRatio());
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
Summary: Qt5 - QtBase components
|
Summary: Qt5 - QtBase components
|
||||||
Name: qt5-qtbase
|
Name: qt5-qtbase
|
||||||
Version: 5.5.1
|
Version: 5.5.1
|
||||||
Release: 8%{?dist}
|
Release: 9%{?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
|
||||||
@ -932,6 +932,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 31 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-9
|
||||||
|
- qt-5.5 segfault on QFileDialog without parent (#1291003)
|
||||||
|
|
||||||
* Mon Nov 09 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-8
|
* Mon Nov 09 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-8
|
||||||
- qt5-qdoc need requires >= current version, otherwise will prevent the usage further when moved to qttools
|
- qt5-qdoc need requires >= current version, otherwise will prevent the usage further when moved to qttools
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user