Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2018-01-31 02:25:36 +00:00
commit 0fa65ed836
8 files changed
+175 -9

No files matched your search

+1 -1
View File
@@ -136,7 +136,7 @@ public:
protected:
void focusInEvent( QFocusEvent* event );
virtual void closeEvent( QCloseEvent* event );
virtual void closeEvent( QCloseEvent* event );
Void setWidget( QWidget* widget );
+4 -4
View File
@@ -196,8 +196,8 @@ VideoSubWindow::~VideoSubWindow()
Void VideoSubWindow::closeEvent( QCloseEvent* event )
{
stop();
SubWindowAbstract::closeEvent( event );
stop();
SubWindowAbstract::closeEvent( event );
}
Void VideoSubWindow::keyPressEvent( QKeyEvent* event )
@@ -796,8 +796,8 @@ Void VideoSubWindow::seekRelativeEvent( Bool bIsFoward )
Void VideoSubWindow::stop()
{
#ifndef QT_NO_CONCURRENT
m_cRefreshResult.waitForFinished();
m_cReadResult.waitForFinished();
m_cRefreshResult.waitForFinished();
m_cReadResult.waitForFinished();
#endif
m_bIsPlaying = false;
seekAbsoluteEvent( 0 );
+1 -1
View File
@@ -207,7 +207,7 @@ private:
protected:
Void keyPressEvent( QKeyEvent* event );
Void resizeEvent( QResizeEvent* event );
Void closeEvent( QCloseEvent *event );
Void closeEvent( QCloseEvent* event );
public Q_SLOTS:
void updateWindowOnTimeout();