anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compilation fix for Qt 4.5

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38963 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2011-06-06 10:29:30 +00:00
parent 0a3aed3061
commit 19478f3efa
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/qt4/FancyLineEdit.cpp
View File

@ -11,8 +11,12 @@
// Code taken from the Qt Creator project and customized a little // Code taken from the Qt Creator project and customized a little
#include <config.h>
#include "FancyLineEdit.h" #include "FancyLineEdit.h"
#if QT_VERSION >= 0x040600
#include <QtCore/QEvent> #include <QtCore/QEvent>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QString> #include <QtCore/QString>
@ -26,8 +30,6 @@
#include <QtGui/QStyle> #include <QtGui/QStyle>
#include <QtGui/QPaintEvent> #include <QtGui/QPaintEvent>
#if QT_VERSION >= 0x040600
enum { margin = 6 }; enum { margin = 6 };
#define ICONBUTTON_HEIGHT 18 #define ICONBUTTON_HEIGHT 18

3
src/frontends/qt4/FancyLineEdit.h
View File

@ -22,6 +22,7 @@ namespace frontend {
class FancyLineEditPrivate; class FancyLineEditPrivate;
#if QT_VERSION >= 0x040600
class IconButton: public QAbstractButton class IconButton: public QAbstractButton
{ {
Q_OBJECT Q_OBJECT
@ -44,7 +45,7 @@ private:
bool m_autoHide; bool m_autoHide;
QPixmap m_pixmap; QPixmap m_pixmap;
}; };
#endif
/* A line edit with an embedded pixmap on one side that is connected to /* 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") * a menu. Additionally, it can display a grayed hintText (like "Type Here to")