Commit these two GIT hashes to the TQt4 branch

078391d07776b101e80323b02214f66dd943c9dc
437b7e59d85fffbd584ecdd50e9a52a5940e6414

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 \

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);