Merge branch 'll-devel'

Conflicts:
	source/plaYUVerApp.cpp
This commit is contained in:
Luis Lucas
2014-03-22 20:23:52 +00:00
5 changed files with 45 additions and 20 deletions
+1
View File
@@ -98,6 +98,7 @@ bool SubWindowHandle::loadFile( const QString &fileName )
QMessageBox::warning( this, tr( "plaYUVer" ), tr( "Cannot read %1." ).arg( fileName ) );
return false;
}
m_cViewArea->setInputStream(m_pCurrStream);
QApplication::restoreOverrideCursor();