Author: lasgouttes
Date: Mon Jun 6 12:29:30 2011
New Revision: 38963
URL: http://www.lyx.org/trac/changeset/38963
Log:
compilation fix for Qt 4.5
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 02:20:59
2011 (r38962)
+++ lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.cpp Mon Jun 6 12:29:30
2011 (r38963)
@@ -11,8 +11,12 @@
// 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>
@@ -26,8 +30,6 @@
#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 02:20:59
2011 (r38962)
+++ lyx-devel/trunk/src/frontends/qt4/FancyLineEdit.h Mon Jun 6 12:29:30
2011 (r38963)
@@ -22,6 +22,7 @@
class FancyLineEditPrivate;
+#if QT_VERSION >= 0x040600
class IconButton: public QAbstractButton
{
Q_OBJECT
@@ -44,7 +45,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")
