update to most recent QtAVPlayer

Project/QtCreator/QCTools.pro

@@ -10,32 +10,6 @@ USE_BREW = $$(USE_BREW)
 
 include(ffmpeg.pri)
 
-QTAVPLAYER = $$absolute_path($$_PRO_FILE_PWD_/qctools-QtAVPlayer)
-message('QTAVPLAYER: ' $$QTAVPLAYER)
-
-QTAVPLAYERLIB = $$absolute_path($$_PRO_FILE_PWD_/qctools-QtAVPlayer-lib)
-message('QTAVPLAYER library support files: ' $$QTAVPLAYERLIB)
-
-defineReplace(nativePath) {
-    OUT_NATIVE_PATH = $$1
-    # Replace slashes in paths with backslashes for Windows
-    win32:OUT_NATIVE_PATH ~= s,/,\\,g
-    return($$OUT_NATIVE_PATH)
-}
-
-win32: {
-    system('xcopy $$nativePath($$QTAVPLAYERLIB/*) $$nativePath($$QTAVPLAYER/) /E /Y')
-    message('xcopy $$nativePath($$QTAVPLAYERLIB/*) $$nativePath($$QTAVPLAYER/) /E /Y')
-} else {
-    macx: {
-        system('cp -R $$shell_path($$QTAVPLAYERLIB/*) $$shell_path($$QTAVPLAYER/)')
-        message('cp -R $$shell_path($$QTAVPLAYERLIB/*) $$shell_path($$QTAVPLAYER/)')
-    } else {
-        system('cp -r -u $$shell_path($$QTAVPLAYERLIB/*) $$shell_path($$QTAVPLAYER/)')
-        message('cp -r -u $$shell_path($$QTAVPLAYERLIB/*) $$shell_path($$QTAVPLAYER/)')
-    }
-}
-
 contains(DEFINES, USE_BREW) {
     message('using ffmpeg from brew via PKGCONFIG')
 
@@ -59,24 +33,17 @@ contains(DEFINES, USE_BREW) {
 
     write_file($$QTAVPLAYER/.qmake.conf, pkgConfig, append)
     write_file($$QTAVPLAYER/.qmake.conf, linkPkgConfig, append)
-} else {
-    message('including $$QTAVPLAYER/QtAVPlayerLib.pri')
-    include($$QTAVPLAYER/QtAVPlayerLib.pri)
 }
 
 SUBDIRS = \
-        qctools-qtavplayer \
         qctools-lib \
         qctools-cli \
         qctools-gui
 
-qctools-qtavplayer.file = qctools-QtAVPlayer/QtAVPlayerLib.pro
-
 qctools-lib.subdir = qctools-lib
 qctools-cli.subdir = qctools-cli
 qctools-gui.subdir = qctools-gui
 
-qctools-lib.depends = qctools-qtavplayer
 qctools-cli.depends = qctools-lib
 qctools-gui.depends = qctools-lib