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 4349afe456a2c834e754d824cb3c2bd72f48891d..0856e0d989a17e60e76baa6f37a7ee2cae4a748d 100644 (file)
--- 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 67c2afb0aba31af6ef2dc6e6f28b0ca5864396c5..b2cebf1d9a4ce81992f20e4cde89731d76499104 100644 (file)
--- 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">