Qt: toolbars, change regroupments of unsplittable buttons as QFrame

I will need that to clarify the Toolbar editor.

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index a78510e8fd70289ff6d12de32a10c2d7e628332c..2a8dc814ab6a692a31482b0f54a8b67c8a790f04 100644 (file)
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -417,10 +417,10 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
     return widget;
 }
 
-QWidget *AbstractController::discFrame()
+QFrame *AbstractController::discFrame()
 {
     /** Disc and Menus handling */
-    QWidget *discFrame = new QWidget( this );
+    QFrame *discFrame = new QFrame( this );
 
     QHBoxLayout *discLayout = new QHBoxLayout( discFrame );
     discLayout->setSpacing( 0 ); discLayout->setMargin( 0 );
@@ -459,7 +459,7 @@ QWidget *AbstractController::discFrame()
     return discFrame;
 }
 
-QWidget *AbstractController::telexFrame()
+QFrame *AbstractController::telexFrame()
 {
     /**
      * Telextext QFrame

diff --git a/modules/gui/qt4/components/controller.hpp b/modules/gui/qt4/components/controller.hpp
index 2726de87252dd21e79151b688725f8058aa9e783..086843f5b1a0480d8e80350f36128147b5c03661 100644 (file)
--- a/modules/gui/qt4/components/controller.hpp
+++ b/modules/gui/qt4/components/controller.hpp
@@ -161,8 +161,8 @@ protected:
     QWidget *createWidget( buttonType_e, int options = WIDGET_NORMAL );
 private:
     static void setupButton( QAbstractButton * );
-    QWidget *discFrame();
-    QWidget *telexFrame();
+    QFrame *discFrame();
+    QFrame *telexFrame();
 
 protected slots:
     virtual void doAction( int );

diff --git a/modules/gui/qt4/components/controller_widget.hpp b/modules/gui/qt4/components/controller_widget.hpp
index 38bb76f386a7ca235bedf0964f39fe0129d5eae1..d6c622c0c2bb94d7188ddc682dc67028be5f38d0 100644 (file)
--- a/modules/gui/qt4/components/controller_widget.hpp
+++ b/modules/gui/qt4/components/controller_widget.hpp
@@ -31,6 +31,7 @@
 #include "qt4.hpp"
 
 #include <QWidget>
+#include <QFrame>
 #include <QToolButton>
 
 #define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
@@ -61,7 +62,7 @@ private slots:
     void setIcons( bool, bool );
 };
 
-class TeletextController : public QWidget
+class TeletextController : public QFrame
 {
     Q_OBJECT
     friend class AbstractController;