rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drop abandoned patch

This commit is contained in:
Rex Dieter 2014-03-07 09:20:35 -06:00
parent 9f99edcb8d
commit b60256a7f5
2 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
qt-everywhere-opensource-src-4.8-QTBUG-27809.patch
View File

@ -1,57 +0,0 @@
commit 22b493d3523140e14df433cd8a49292b7f73f21c
Author: Peter Seiderer <Peter.Seiderer@gmx.de>
Date: Sat May 11 07:49:47 2013 +0200
Fix multiple calls to QDBusPendingReply::waitForFinished on separate objects
QTBUG-27809
Change-Id: If1691052ed1542e0e865c83df7b5737761a2bc86
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 96e4a12..1007f1a 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -1774,14 +1774,11 @@ void QDBusConnectionPrivate::waitForFinished(QDBusPendingCallPrivate *pcall)
pcall->waitForFinishedCondition.wait(&pcall->mutex);
} else {
pcall->waitingForFinished = true;
- pcall->mutex.unlock();
-
{
QDBusDispatchLocker locker(PendingCallBlockAction, this);
q_dbus_pending_call_block(pcall->pending);
- // QDBusConnectionPrivate::processFinishedCall() is called automatically
+ processFinishedCall(pcall);
}
- pcall->mutex.lock();
}
}
@@ -1789,8 +1786,6 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call)
{
QDBusConnectionPrivate *connection = const_cast<QDBusConnectionPrivate *>(call->connection);
- QMutexLocker locker(&call->mutex);
-
QDBusMessage &msg = call->replyMessage;
if (call->pending) {
// decode the message
@@ -1824,7 +1819,8 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call)
q_dbus_pending_call_unref(call->pending);
call->pending = 0;
- locker.unlock();
+ if (call->waitingForFinished)
+ call->waitForFinishedCondition.wakeAll();
// Are there any watchers?
if (call->watcherHelper)
@@ -2009,7 +2005,6 @@ QDBusPendingCallPrivate *QDBusConnectionPrivate::sendWithReplyAsync(const QDBusM
q_dbus_message_unref(msg);
pcall->pending = pending;
- q_dbus_pending_call_set_notify(pending, qDBusResultReceived, pcall, 0);
return pcall;
} else {

4
qt.spec
View File

@ -158,9 +158,6 @@ Patch103: QTBUG-15319-fix-shortcuts-with-secondary-Xkb-layout.patch
# workaround for MOC issues with Boost headers (#756395)
# https://bugreports.qt-project.org/browse/QTBUG-22829
Patch113: qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
# https://codereview.qt-project.org/#change,55874
# REVERT, causes regressions http://bugzilla.redhat.com/968794
#Patch155: qt-everywhere-opensource-src-4.8-QTBUG-27809.patch
# aarch64 support
# https://bugreports.qt-project.org/browse/QTBUG-35442
@ -534,7 +531,6 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch102 -p1 -b .qgtkstyle_disable_gtk_theme_check
%patch103 -p1 -R -b .QTBUG-15319
%patch113 -p1 -b .QTBUG-22829
#patch155 -p1 -b .QTBUG-27809
# aarch64
%patch180 -p1 -b .aarch64