Remove the corner button too

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg150647.html

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

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 37c9db7e0d4517d6a5a48efe761dd804a4d0f333..5fa04fb0493d08da848d680167a1945c9b6eea73 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -1310,6 +1310,7 @@ TabWorkArea::TabWorkArea(QWidget * parent)
        QObject::connect(this, SIGNAL(currentChanged(int)),
                this, SLOT(on_currentTabChanged(int)));
 
+#if QT_VERSION < 0x040500
        closeBufferButton = new QToolButton(this);
        closeBufferButton->setPalette(pal);
        // FIXME: rename the icon to closebuffer.png
@@ -1322,6 +1323,7 @@ TabWorkArea::TabWorkArea(QWidget * parent)
        QObject::connect(closeBufferButton, SIGNAL(clicked()),
                this, SLOT(closeCurrentBuffer()));
        setCornerWidget(closeBufferButton, Qt::TopRightCorner);
+#endif
 
        // setup drag'n'drop
        QTabBar* tb = new DragTabBar;
@@ -1359,7 +1361,9 @@ void TabWorkArea::showBar(bool show)
 {
        tabBar()->setEnabled(show);
        tabBar()->setVisible(show);
+#if QT_VERSION < 0x040500
        closeBufferButton->setVisible(show);    
+#endif
 }
 
 

diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h
index 3dc7e6c9072c1293594ffae068070d172ab2fb6e..0429458a45ca9286d586f1b985c0f7a374bad476 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.h
+++ b/src/frontends/qt4/GuiWorkArea.h
@@ -332,8 +332,10 @@ private Q_SLOTS:
 private:
        ///
        int clicked_tab_;
+#if QT_VERSION < 0x040500
        ///
        QToolButton * closeBufferButton;
+#endif
 }; // TabWorkArea