Compile fix for qt versions below 4.6.

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

diff --git a/src/frontends/qt4/FancyLineEdit.cpp b/src/frontends/qt4/FancyLineEdit.cpp
index f3080104c643511356e07ba1251b23b840b8b1f8..da4dc7e1a6a98dd76e4faaa1cc67263bde2e7b7a 100644 (file)
--- a/src/frontends/qt4/FancyLineEdit.cpp
+++ b/src/frontends/qt4/FancyLineEdit.cpp
@@ -26,6 +26,8 @@
 #include <QtGui/QStyle>
 #include <QtGui/QPaintEvent>
 
+#if QT_VERSION >= 0x040600
+
 enum { margin = 6 };
 
 #define ICONBUTTON_HEIGHT 18
@@ -302,4 +304,6 @@ void IconButton::animateShow(bool visible)
 
 }
 
+#endif // QT_VERSION >= 0x040600
+
 #include "moc_FancyLineEdit.cpp"

diff --git a/src/frontends/qt4/FancyLineEdit.h b/src/frontends/qt4/FancyLineEdit.h
index a3569a8cd0e8e79b61999f67ac0609ac021f9982..ec472eed8c7ee8cc3f652f91693f7d3f39025b4c 100644 (file)
--- a/src/frontends/qt4/FancyLineEdit.h
+++ b/src/frontends/qt4/FancyLineEdit.h
@@ -62,6 +62,13 @@ class FancyLineEdit : public QLineEdit
 public:
     enum Side {Left = 0, Right = 1};
 
+Q_SIGNALS:
+    void buttonClicked(Side side);
+    void leftButtonClicked();
+    void rightButtonClicked();
+
+#if QT_VERSION >= 0x040600
+public:
     explicit FancyLineEdit(QWidget *parent = 0);
     ~FancyLineEdit();
 
@@ -85,11 +92,6 @@ public:
     void setAutoHideButton(Side side, bool h);
     bool hasAutoHideButton(Side side) const;
 
-Q_SIGNALS:
-       void buttonClicked(Side side);
-    void leftButtonClicked();
-    void rightButtonClicked();
-
 private Q_SLOTS:
     void checkButtons(const QString &);
     void iconClicked();
@@ -103,6 +105,12 @@ private:
 
     FancyLineEditPrivate *m_d;
     QString m_oldText;
+#else
+public:
+       explicit FancyLineEdit(QWidget *parent = 0) 
+               : QLineEdit(parent) 
+       {}
+#endif // QT_VERSION >= 0x040600*/
 };
 
 }

diff --git a/src/frontends/qt4/PanelStack.cpp b/src/frontends/qt4/PanelStack.cpp
index 1863040bd19d107b3dda132e1a2e353dc1ec0a89..5537ee156236aa0b05db485df6137b717438f213 100644 (file)
--- a/src/frontends/qt4/PanelStack.cpp
+++ b/src/frontends/qt4/PanelStack.cpp
@@ -75,10 +75,12 @@ PanelStack::PanelStack(QWidget * parent)
        search_->setPlaceholderText(qt_("Search"));
 #endif
 
+#if QT_VERSION >= 0x040600
        search_->setButtonPixmap(FancyLineEdit::Right, getPixmap("images/", "editclear", "png"));
        search_->setButtonVisible(FancyLineEdit::Right, true);
        search_->setButtonToolTip(FancyLineEdit::Right, qt_("Clear text"));
        search_->setAutoHideButton(FancyLineEdit::Right, true);
+#endif
        connect(search_, SIGNAL(rightButtonClicked()), this, SLOT(resetSearch()));
        connect(search_, SIGNAL(textEdited(QString)), this, SLOT(filterChanged(QString)));