From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 11 Jan 2010 14:34:14 +0000 (+0000)
Subject: compile fix for qt<4.4
X-Git-Tag: 2.0.0~4430
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0553351d71c7a436f7f193433af2f43b501ef78f;p=lyx.git

compile fix for qt<4.4

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32964 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiProgressView.cpp b/src/frontends/qt4/GuiProgressView.cpp
index 4349afe456..0856e0d989 100644
--- a/src/frontends/qt4/GuiProgressView.cpp
+++ b/src/frontends/qt4/GuiProgressView.cpp
@@ -52,9 +52,6 @@ GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area,
 	: DockView(parent, "progress", "Debug/Progress window", area, flags)
 {
 	widget_ = new ProgressViewWidget();
-#if QT_VERSION < 0x040400
-	widget_->scrollArea->setWidget(widget_->scrollAreaWidgetContents);
-#endif
 	widget_->setMinimumHeight(150);
 	widget_->adjustSize();
 	setWidget(widget_);
diff --git a/src/frontends/qt4/ui/FindAndReplaceUi.ui b/src/frontends/qt4/ui/FindAndReplaceUi.ui
index 67c2afb0ab..b2cebf1d9a 100644
--- a/src/frontends/qt4/ui/FindAndReplaceUi.ui
+++ b/src/frontends/qt4/ui/FindAndReplaceUi.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>FindAndReplaceUi</class>
  <widget class="QWidget" name="FindAndReplaceUi">