修改qmake

qht1003077897 · Sep 4, 2020 · 2626f83 · 2626f83
2 parents 2dbfdc9 f48269a
commit 2626f83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
@@ -1275,10  1275,9 @@ void AVPlayer::slotopenDecodecFinish()
 {    
     qDebug("QHT AVPlayer::slotopenDecodecFinish");
     disconnect(this,SIGNAL(openDecodecFinish()),this,SLOT(slotopenDecodecFinish()));
-    //QHT video 不允许缺失  audio 允许缺失
-    if (!d->vthread) {
     if (!d->vthread && !d->athread) {
         d->loaded = false;
-        qWarning("QHT AVPlayer::slotopenDecodecFinish load Video failed");
         qWarning("QHT AVPlayer::slotopenDecodecFinish load failed");
         return;
     }
     {

diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -660,6  660,7 @@ MODULE_VERSION = $$VERSION
 # windows: Qt5AV.dll, not Qt1AV.dll
 !mac_framework: MODULE_VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 !contains(QMAKE_HOST.os, Windows):include($$PROJECTROOT/deploy.pri)
 <<<<<<< HEAD
 unix:!mac{
     # suppress the default RPATH if you wish
     QMAKE_LFLAGS_RPATH=

diff --git a/widgets/libQtAVWidgets.pro b/widgets/libQtAVWidgets.pro
@@ -171,6  171,7 @@ MODULE_VERSION = $$VERSION
 # windows: Qt5AV.dll, not Qt1AV.dll
 !mac_framework: MODULE_VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 !contains(QMAKE_HOST.os, Windows):include($$PROJECTROOT/deploy.pri)
 <<<<<<< HEAD
 unix:!mac{
     # suppress the default RPATH if you wish
     QMAKE_LFLAGS_RPATH=