diff --git a/sources/projectview.cpp b/sources/projectview.cpp index fd8d89c68..69735f1ca 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -30,6 +30,7 @@ #include "conductorpropertieswidget.h" #include "qeticons.h" #include "qetmessagebox.h" +#include "qettabbar.h" /** Constructeur diff --git a/sources/qettabbar.cpp b/sources/qettabbar.cpp index dc20b1f00..9ab5edb26 100644 --- a/sources/qettabbar.cpp +++ b/sources/qettabbar.cpp @@ -253,6 +253,7 @@ bool QETTabBar::mustMoveTab(int src_tab, int dst_tab, const QPoint &pos) const { @param dst_tab Index de l'onglet de destination */ void QETTabBar::moveTab(int src_tab, int dst_tab) { +#if QT_VERSION < 0x040500 // sauvegarde les caracteristiques de l'onglet deplace QIcon old_tab_icon = tabIcon(src_tab); QVariant old_tab_data = tabData(src_tab); @@ -283,6 +284,9 @@ void QETTabBar::moveTab(int src_tab, int dst_tab) { // signale le deplacement de l'onglet emit(tabMoved(src_tab, dst_tab)); +#else + QTabBar::moveTab(src_tab, dst_tab); +#endif } /** diff --git a/sources/qettabwidget.cpp b/sources/qettabwidget.cpp index ed6d52388..a3ebbe26e 100644 --- a/sources/qettabwidget.cpp +++ b/sources/qettabwidget.cpp @@ -66,8 +66,8 @@ bool QETTabWidget::isMovable() const { #endif } -QTabBar *QETTabWidget::tabBar() const { - return(QTabWidget::tabBar()); +QETTabBar *QETTabWidget::tabBar() const { + return(tab_bar_); } /** diff --git a/sources/qettabwidget.h b/sources/qettabwidget.h index b90499888..ef670ee14 100644 --- a/sources/qettabwidget.h +++ b/sources/qettabwidget.h @@ -40,7 +40,7 @@ class QETTabWidget : public QTabWidget { public: void setMovable(bool); bool isMovable() const; - QTabBar *tabBar() const; + QETTabBar *tabBar() const; protected: void wheelEvent(QWheelEvent *);