The last round of changes has been pretty bad for Qt 4.2 support. I have
a patch for some issues (below), but then I have problems with CompareUi and
PrefLatexUi which use left/right/top/bottom margins.
Can somebody fix that or are we going to decide to drop qt 4.2 and jump
to 4.3 or 4.4? I can live with it, but it should be done properly before
release. Pavel, I guess it is your call.
JMarc
svndiff src/frontends/qt4/
Index: src/frontends/qt4/GuiApplication.cpp
===================================================================
--- src/frontends/qt4/GuiApplication.cpp (révision 33845)
+++ src/frontends/qt4/GuiApplication.cpp (copie de travail)
@@ -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 & arg
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
}
Index: src/frontends/qt4/FindAndReplace.cpp
===================================================================
--- src/frontends/qt4/FindAndReplace.cpp (révision 33845)
+++ src/frontends/qt4/FindAndReplace.cpp (copie de travail)
@@ -53,9 +53,6 @@ FindAndReplaceWidget::FindAndReplaceWidg
: 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);
