Merge branch 'master' into ll-devel

source/plaYUVerApp.cpp

@@ -64,7 +64,9 @@ plaYUVerApp::plaYUVerApp()
   setUnifiedTitleAndToolBarOnMac( true );
 
   playingTimer = new QTimer;
+#if( QT_VERSION_PLAYUVER == 5 )
   playingTimer->setTimerType( Qt::CoarseTimer );
+#endif
   connect( playingTimer, SIGNAL( timeout() ), this, SLOT( playEvent() ) );
 
   setAcceptDrops( true );