diff options
| author | Armin Berres <trigger+debian@space-based.de> | 2008-12-01 23:18:58 +0000 |
|---|---|---|
| committer | Armin Berres <trigger+debian@space-based.de> | 2008-12-01 23:18:58 +0000 |
| commit | e42b3ad887b68e0f0556f8a620042a86c0a2eee1 (patch) | |
| tree | 1eb62782f485995a171685782b2d3f4f415bcc70 /debian/patches/0261-sync-before-reset-errorhandler.patch | |
| parent | c6857e17d2e54b2b874bbdb8ae3e08ede84cac10 (diff) | |
| download | qt4-x11-e42b3ad887b68e0f0556f8a620042a86c0a2eee1.tar.gz | |
add qt-copy patches, but don't uncomment them in the series file for the moment. i couldn't test qt with this patches yet. it fails to build for whatever reason
Diffstat (limited to 'debian/patches/0261-sync-before-reset-errorhandler.patch')
| -rw-r--r-- | debian/patches/0261-sync-before-reset-errorhandler.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/0261-sync-before-reset-errorhandler.patch b/debian/patches/0261-sync-before-reset-errorhandler.patch new file mode 100644 index 0000000..2128ba8 --- /dev/null +++ b/debian/patches/0261-sync-before-reset-errorhandler.patch @@ -0,0 +1,22 @@ +qt-bugs@ issue : 236401 +Trolltech task ID : none +bugs.kde.org number : none +applied: no +author: Lubos Lunak <l.lunak@kde.org> + +Sync X connection before resetting X error handler to the one provided +by Xlib (which just aborts), in case there are still queued requests +that may result in an error. + + +--- a/src/gui/kernel/qapplication_x11.cpp ++++ b/src/gui/kernel/qapplication_x11.cpp +@@ -2312,6 +2312,8 @@ void qt_cleanup() + #endif + + // Reset the error handlers ++ if (qt_is_gui_used) ++ XSync(X11->display, False); // sync first to process all possible errors + XSetErrorHandler(original_x_errhandler); + XSetIOErrorHandler(original_xio_errhandler); + |