From 72363f884eb0d7d8322c9c3e334c0082d8880dc3 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 27 Sep 2011 00:43:15 -0500
Subject: [PATCH] Commit these two GIT hashes to the TQt4 branch
 078391d07776b101e80323b02214f66dd943c9dc
 437b7e59d85fffbd584ecdd50e9a52a5940e6414

---
 tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro | 1 +
 tqtinterface/qt4/src/kernel/tqjpegio.cpp              | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro b/tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro
index 9a65291..994f0d4 100644
--- a/tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro
+++ b/tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro
@@ -6,6 +6,7 @@ INCLUDEPATH += .
 CONFIG      += qt warn_on debug plugin
 target.path += $$plugins.path/inputmethods
 INSTALLS    += target
+DEFINES     += QT_NO_XINERAMA
 
 # Input
 HEADERS += qximinputcontext.h \
diff --git a/tqtinterface/qt4/src/kernel/tqjpegio.cpp b/tqtinterface/qt4/src/kernel/tqjpegio.cpp
index dbaa301..1f3ffd8 100644
--- a/tqtinterface/qt4/src/kernel/tqjpegio.cpp
+++ b/tqtinterface/qt4/src/kernel/tqjpegio.cpp
@@ -203,13 +203,13 @@ void read_jpeg_image(TQImageIO* iio)
     struct my_jpeg_source_mgr *iod_src = new my_jpeg_source_mgr(iio);
     struct my_error_mgr jerr;
 
+    cinfo.err = jpeg_std_error(&jerr);
+    jerr.error_exit = my_error_exit;
+
     jpeg_create_decompress(&cinfo);
 
     cinfo.src = iod_src;
 
-    cinfo.err = jpeg_std_error(&jerr);
-    jerr.error_exit = my_error_exit;
-
     if (!setjmp(jerr.setjmp_buffer)) {
 #if defined(TQ_OS_UNIXWARE)
 	(void) jpeg_read_header(&cinfo, B_TRUE);