Author: lasgouttes
Date: Mon Jun 6 17:53:43 2011
New Revision: 38969
URL: http://www.lyx.org/trac/changeset/38969
Log:
Revert r38963. Compilation is now broken with qt 4.5, but I do not know Qt moc
business and do not have time to investigate.
Modified:
lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.cpp
lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.h
Modified: lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.cpp Mon Jun 6 16:44:36
2011 (r38968)
+++ lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.cpp Mon Jun 6 17:53:43
2011 (r38969)
@@ -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
Modified: lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.h
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.h Mon Jun 6 16:44:36
2011 (r38968)
+++ lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.h Mon Jun 6 17:53:43
2011 (r38969)
@@ -22,7 +22,6 @@
class FancyLineEditPrivate;
-#if QT_VERSION >= 0x040600
class IconButton: public QAbstractButton
{
Q_OBJECT
@@ -45,7 +44,7 @@
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")
