From 19478f3efa546378818af103be9c03cd63d9fc54 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 6 Jun 2011 10:29:30 +0000 Subject: [PATCH] compilation fix for Qt 4.5 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38963 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/FancyLineEdit.cpp | 6 ++++-- src/frontends/qt4/FancyLineEdit.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/FancyLineEdit.cpp b/src/frontends/qt4/FancyLineEdit.cpp index da4dc7e1a6..428e0a1849 100644 --- a/src/frontends/qt4/FancyLineEdit.cpp +++ b/src/frontends/qt4/FancyLineEdit.cpp @@ -11,8 +11,12 @@ // Code taken from the Qt Creator project and customized a little +#include + #include "FancyLineEdit.h" +#if QT_VERSION >= 0x040600 + #include #include #include @@ -26,8 +30,6 @@ #include #include -#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 ec472eed8c..89ef45b4ab 100644 --- a/src/frontends/qt4/FancyLineEdit.h +++ b/src/frontends/qt4/FancyLineEdit.h @@ -22,6 +22,7 @@ namespace frontend { class FancyLineEditPrivate; +#if QT_VERSION >= 0x040600 class IconButton: public QAbstractButton { Q_OBJECT @@ -44,7 +45,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")