Merge branch 'master' into devel
This commit is contained in:
commit
7c6c660c2f
26 files changed
+75
-28
No files matched your search
@@ -26,7 +26,7 @@
|
||||
#define __VIDEOSUBWINDOW_H__
|
||||
|
||||
#include "config.h"
|
||||
#include "lib/PlaYUVerDefs.h"
|
||||
#include "PlaYUVerAppDefs.h"
|
||||
#if( QT_VERSION_PLAYUVER == 5 )
|
||||
#include <QtWidgets>
|
||||
#elif( QT_VERSION_PLAYUVER == 4 )
|
||||
|
||||
Reference in new issue
Block a user