1
0
mirror of https://gitee.com/drabel/LibQQt.git synced 2025-01-04 10:18:44 +08:00

add QQtBase.pro

This commit is contained in:
tianduanrui 2018-06-06 20:29:54 +08:00
parent a7594fbe5d
commit 1a54418265
8 changed files with 23 additions and 16 deletions

View File

@ -5,6 +5,9 @@
TEMPLATE = subdirs
CONFIG += ordered
#警告如果发现编译面板里链接成功了App程序死活说找不到-lLibName去那个源文件改一改源文件只要有一点改动就可以链接成功
#Windows系统里有这种bug不确定是mingw编译器的还是系统的
#这几个选项自行决定QQt一次编译完成两个版本
#用户自行选择release还是debug版本使用即可
#比较方便
@ -16,4 +19,4 @@ CONFIG += ordered
#注意这里用include保证了路径直接在QQt.pro下边
#如果用SUBDIRS+=会在子目录src里
#但是这里必须用subdirsinclude有个特点pro或者pri的PWD不是pro的路径而是调用者的路径
SUBDIRS += src/qqt.pro
SUBDIRS += src/QQtBase.pro

View File

@ -7,6 +7,7 @@
##Library工程组和App工程组分开编译不会引发这个bug
##-----------------------------------------------------------------
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS =
@ -57,13 +58,16 @@ SUBDIRS =
#macOS无故会记忆过去的链接位置无解
#SUBDIRS += test/qqtlog4cpptest
#need ffmpeg library
#SUBDIRS += test/qqtffmpegplayer
#测试libQQt的链接
#
SUBDIRS += test/giftest
#SUBDIRS += test/giftest
########################################################################################
#macOS Windows
#need ffmpeg library
#SUBDIRS += test/qqtffmpegplayer
########################################################################################
#macOS Windows linux

View File

@ -41,7 +41,7 @@ system(touch main.cpp)
#添加所有提供函数的pri 很有美感
############################################
include (../../multi-link/multi-link/add_base_manager.pri)
include (../../app-lib/add_library_OpenCV.pri)
include (../../multi-link/app-lib/add_library_OpenCV.pri)
############################################
#对产品线的控制结构Multi-link下命令 开启产品线
@ -49,10 +49,10 @@ include (../../app-lib/add_library_OpenCV.pri)
#这里做的事情可以拷贝custom manager到app目录里再custom manager里面完成
add_version(1,0,0,0)
add_deploy()
add_dependent_manager(QQtBase)
add_deploy_config($$PWD/AppRoot)
#添加其他library
#app 发布library OpenCV 只有app才会发布
add_dependent_manager(QQtBase)
add_dependent_library_OpenCV()

View File

@ -2,6 +2,7 @@
#include "ui_mainwindow.h"
#include <opencv.hpp>
#include <highgui.hpp>
#include <qqtgiflabel.h>
MainWindow::MainWindow ( QWidget* parent ) :
QMainWindow ( parent ),
@ -15,6 +16,8 @@ MainWindow::MainWindow ( QWidget* parent ) :
cv::namedWindow ( "OpenCV Image" );
// show the image on window
cv::imshow ( "OpenCV Image", image );
QQtGifLabel* label = new QQtGifLabel ( this );
}
MainWindow::~MainWindow()

@ -1 +1 @@
Subproject commit a686b7f676705494f170626eb579717521ceba0f
Subproject commit c319bb9e97692a7579efb22e7913212294a7ad9c

View File

@ -139,6 +139,7 @@ contains(CONFIG, continue_build){
##project environ
#################################################################
#default
message ($${TARGET} QT $${QT})
message ($${TARGET} config $${CONFIG})
message ($${TARGET} define $${DEFINES})
message ($${TARGET} pre link $${QMAKE_PRE_LINK})

View File

@ -12,6 +12,5 @@ int main ( int argc, char* argv[] )
w.show();
//moveFull ( &w );
return a.exec();
}

View File

@ -1,12 +1,9 @@
#include "FFmpegPlayer.h"
#include<QDebug>
#include "qqtcore.h"
#include "qqt-local.h"
#include<iostream>
#include "qqt.h"
#if defined (__WIN32__) || defined (__WIN64__)
#include<windows.h>
#else
#define nullptr NULL
#endif
using namespace std;
bool isquit = false; //