From d95b35dad838140db8b11a5cb7ba4f5dfb4165ce Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Wed, 24 Mar 2010 08:50:06 +0000
Subject: [PATCH] Fix for Qt 4.2 (patch mostly from JMarc).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33848 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/FindAndReplace.cpp | 3 ---
 src/frontends/qt4/GuiApplication.cpp | 4 ++++
 src/frontends/qt4/ui/PrefLatexUi.ui  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index 42628d7a71..85c2ddea86 100644
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -53,9 +53,6 @@ FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view)
 	:	view_(view)
 {
 	setupUi(this);
-#if QT_VERSION < 0x040400
-	scrollArea->setWidget(scrollAreaWidgetContents);
-#endif
 	find_work_area_->setGuiView(view_);
 	find_work_area_->init();
 	find_work_area_->setFrameStyle(QFrame::StyledPanel);
diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index c56524fd24..4daecb0e42 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -104,7 +104,9 @@
 #include <QTextCodec>
 #include <QTimer>
 #include <QTranslator>
+#if QT_VERSION >= 0x040300
 #include <QThreadPool>
+#endif
 #include <QWidget>
 
 #ifdef Q_WS_X11
@@ -822,10 +824,12 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 		this, SLOT(handleRegularEvents()));
 	d->general_timer_.start();
 
+#if QT_VERSION >= 0x040300
 	// maxThreadCount() defaults in general to 2 on single or dual-processor.
 	// This is clearly not enough in a time where we use threads for
 	// document preview and/or export. 20 should be OK.
 	QThreadPool::globalInstance()->setMaxThreadCount(20);
+#endif
 }
 
 
diff --git a/src/frontends/qt4/ui/PrefLatexUi.ui b/src/frontends/qt4/ui/PrefLatexUi.ui
index 63a61258b8..546e2731fd 100644
--- a/src/frontends/qt4/ui/PrefLatexUi.ui
+++ b/src/frontends/qt4/ui/PrefLatexUi.ui
@@ -15,10 +15,10 @@
   <layout class="QGridLayout" name="gridLayout_5">
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout_4">
-     <property name="leftMargin">
+     <property name="margin">
       <number>0</number>
      </property>
-     <property name="rightMargin">
+     <property name="margin">
       <number>0</number>
      </property>
      <item row="0" column="0">
-- 
2.39.2