Merge master with devel

This commit is contained in:
jfmcarreira committed 2015-01-13 13:41:26 +00:00
1 parent d492870273
commit 3624c5477b
1 file changed
-3
-3
View File
@@ -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()