From 3cb448b64ab00b6e49b0c4288ccaee339cae100a Mon Sep 17 00:00:00 2001 From: tianduanrui <2407223896@qq.com> Date: Sat, 2 Jun 2018 23:58:03 +0800 Subject: [PATCH] update --- QQtExample_Temp.pro | 3 +-- app-lib/add_library_FFmpeg.pri | 2 +- test/qqtffmpegplayer/qqtffmpegplayer.pro | 6 +----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/QQtExample_Temp.pro b/QQtExample_Temp.pro index 2965fc13..064cad10 100644 --- a/QQtExample_Temp.pro +++ b/QQtExample_Temp.pro @@ -49,5 +49,4 @@ SUBDIRS = #SUBDIRS += test/QQtQwtPlot3DTest #need log4cpp sdk -# -SUBDIRS += test/qqtlog4cpptest +#SUBDIRS += test/qqtlog4cpptest diff --git a/app-lib/add_library_FFmpeg.pri b/app-lib/add_library_FFmpeg.pri index b878da24..85a31785 100644 --- a/app-lib/add_library_FFmpeg.pri +++ b/app-lib/add_library_FFmpeg.pri @@ -19,7 +19,7 @@ unix { ####################################################################################### #4.0 LIBRARYVER = -DEBUG = d +DEBUG = #这个地方,mingw比较特殊必须发布release版本,其他平台不清楚。 mingw:DEBUG= contains(BUILD, Release) { diff --git a/test/qqtffmpegplayer/qqtffmpegplayer.pro b/test/qqtffmpegplayer/qqtffmpegplayer.pro index 73c76361..0d926510 100644 --- a/test/qqtffmpegplayer/qqtffmpegplayer.pro +++ b/test/qqtffmpegplayer/qqtffmpegplayer.pro @@ -21,9 +21,6 @@ HEADERS += $$PWD/qqtapp.h $$PWD/qqtwindow.h \ FORMS += $$PWD/qqtwindow.ui include(../../multi-link/add_base_manager.pri) -include (../../app-lib/add_dependent_manager.pri) - -include(../../app-lib/add_library_FFmpeg.pri) #这个的设置有特点,要先设置 add_version (1,0,0,0) @@ -35,5 +32,4 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy add_dependent_manager(QQt) - -add_dependent_library_FFmpeg() +add_dependent_manager(FFmpeg)