fix build error.

xtfvje · Apr 11, 2014 · 7df783a · 7df783a
1 parent 3e56c0e
commit 7df783a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/QtAV.pro b/QtAV.pro
@@ -5,7 +5,8 @@ CONFIG -= ordered
 SUBDIRS = libqtav
 libqtav.file = src/libQtAV.pro
 greaterThan(QT_MAJOR_VERSION, 4) {
-  qtHaveModule(quick) {
+  # qtHaveModule does not exist in Qt5.0
+  isEqual(QT_MINOR_VERSION, 0)|qtHaveModule(quick) {
     SUBDIRS += libqmlav
     libqmlav.file = qml/libQmlAV.pro
     libqmlav.depends += libqtav

diff --git a/examples/common/ScreenSaver.cpp b/examples/common/ScreenSaver.cpp
@@ -29,6 +29,12 @@ static QLibrary xlib;
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QAbstractNativeEventFilter>
 #endif
+//mingw gcc4.4 EXECUTION_STATE
+#ifdef __MINGW32__
+#ifndef _WIN32_WINDOWS
+#define _WIN32_WINDOWS 0x0410
+#endif //_WIN32_WINDOWS
+#endif //__MINGW32__
 #include <windows.h>
 #define USE_NATIVE_EVENT 0
 

diff --git a/examples/examples.pro b/examples/examples.pro
@@ -8,13 +8,16 @@ SUBDIRS += \
     filters \
     videographicsitem \
     videogroup \
-    videowall \
-    qmlmultiwindow
+    videowall
 
 player.depends += common
 
-greaterThan(QT_MAJOR_VERSION, 4):qtHaveModule(quick) {
-  SUBDIRS += QMLPlayer \
-            qmlvideofx
-  QMLPlayer.depends += common
+greaterThan(QT_MAJOR_VERSION, 4) {
+  # qtHaveModule does not exist in Qt5.0
+  isEqual(QT_MINOR_VERSION, 0)|qtHaveModule(quick) {
+    SUBDIRS += QMLPlayer \
+              qmlvideofx \
+              qmlmultiwindow
+    QMLPlayer.depends += common
+  }
 }
diff --git a/src/QtAV/AVDemuxer.h b/src/QtAV/AVDemuxer.h
@@ -188,7 +188,7 @@ class Q_AV_EXPORT AVDemuxer : public QObject //QIODevice?
 signals:
     /*emit when the first frame is read*/
     void started();
-    Q_DECL_DEPRECATED void finished(); //end of file
+    void finished(); //end of file
     void error(const QtAV::AVError& e); //explictly use QtAV::AVError in connection for Qt4 syntax
     void mediaStatusChanged(QtAV::MediaStatus status);