Revert r38963. Compilation is now broken with qt 4.5, but I do not know Qt moc busine...

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

diff --git a/src/frontends/qt4/FancyLineEdit.cpp b/src/frontends/qt4/FancyLineEdit.cpp
index 428e0a184970aaf1c004dca149e5074bcb9db68e..da4dc7e1a6a98dd76e4faaa1cc67263bde2e7b7a 100644 (file)
--- a/src/frontends/qt4/FancyLineEdit.cpp
+++ b/src/frontends/qt4/FancyLineEdit.cpp
@@ -11,12 +11,8 @@
 
 // Code taken from the Qt Creator project and customized a little
 
-#include <config.h>
-
 #include "FancyLineEdit.h"
 
-#if QT_VERSION >= 0x040600
-
 #include <QtCore/QEvent>
 #include <QtCore/QDebug>
 #include <QtCore/QString>
@@ -30,6 +26,8 @@
 #include <QtGui/QStyle>
 #include <QtGui/QPaintEvent>
 
+#if QT_VERSION >= 0x040600
+
 enum { margin = 6 };
 
 #define ICONBUTTON_HEIGHT 18

diff --git a/src/frontends/qt4/FancyLineEdit.h b/src/frontends/qt4/FancyLineEdit.h
index 89ef45b4abc35b97ed0bf82bc2eb3ff917ab146a..ec472eed8c7ee8cc3f652f91693f7d3f39025b4c 100644 (file)
--- a/src/frontends/qt4/FancyLineEdit.h
+++ b/src/frontends/qt4/FancyLineEdit.h
@@ -22,7 +22,6 @@ namespace frontend {
 
 class FancyLineEditPrivate;
 
-#if QT_VERSION >= 0x040600
 class IconButton: public QAbstractButton
 {
        Q_OBJECT
@@ -45,7 +44,7 @@ private:
     bool m_autoHide;
     QPixmap m_pixmap;
 };
-#endif
+
 
 /* A line edit with an embedded pixmap on one side that is connected to
  * a menu. Additionally, it can display a grayed hintText (like "Type Here to")