From 3624c5477b1d62567e4b76c01b0a613f0b389cc6 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 13 Jan 2015 13:41:26 +0000 Subject: [PATCH] Merge master with devel --- app/plaYUVerApp.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/plaYUVerApp.cpp b/app/plaYUVerApp.cpp index e3418b4..46abac2 100644 --- a/app/plaYUVerApp.cpp +++ b/app/plaYUVerApp.cpp @@ -749,7 +749,6 @@ Void plaYUVerApp::createActions() m_arrayActions[ZOOM_FIT_ACT]->setStatusTip( tr( "Zoom in or out to fit on the window." ) ); connect( m_arrayActions[ZOOM_FIT_ACT], SIGNAL( triggered() ), this, SLOT( zoomToFit() ) ); - // ------------ Tools ------------ actionGroupTools = new QActionGroup( this ); actionGroupTools->setExclusive( true ); @@ -930,8 +929,6 @@ Void plaYUVerApp::createDockWidgets() { // Properties Dock Window m_arraySideBars.resize( TOTAL_DOCK ); - addDockWidget( Qt::RightDockWidgetArea, m_appModuleVideo->createDock() ); - addDockWidget( Qt::RightDockWidgetArea, m_appModuleQuality->createDock() ); } Void plaYUVerApp::createStatusBar()