Merge branch 'master' of https://github.com/jaredtao/TaoQuick

# Conflicts:
#	src/src.pro

README.md

@@ -1,5 +1,6 @@
 [English](README-en.md)
 
+[gitee镜像:https://gitee.com/jaredtao/TaoQuick](https://gitee.com/jaredtao/TaoQuick)
 -------------------------------------------------------------
 
 # 目录

TaoQuick.pro

@@ -5,4 +5,5 @@ SUBDIRS += \
 OTHER_FILES += README.md \
     Install.md \
     .clang-format \
-    LICENSE
+    LICENSE \
+    .github/workflows/*

src/TaoEffectPlugin/Qml/ContentPage/Effect/RingPage.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick 2.12
 import QtQuick.Controls 2.12
 import "./Effects"
 TRingPage {

src/TaoQuick/Src/taoquick_plugin.cpp

@@ -8,7 +8,7 @@ void TaoQuickPlugin::registerTypes(const char *uri)
     qInfo() << "\033[35m"
             << "Your application is using TaoQuick ";
     qInfo() << " Version:" << TaoVer;
-    qInfo() << " Revision:" << TaoREVISION;
+    qInfo() << " Revision:" << TaoREVISIONSTR;
     qInfo() << " Author: Jared Tao";
     qInfo() << " You can find more info about TaoQuick in website:"
             << "\033[0m"

src/TaoQuickApp/Src/TaoView.cpp

@@ -1,10 +1,14 @@
-#include "TaoView.h"
+#include "TaoView.h"
 #include "Logger/Logger.h"
-#include "Ver.h"
+#ifdef VER_Utf16
+#include "Ver-u16.h"
+#else
+#include "Ver-u8.h"
+#endif
 
 #include <QTranslator>
 #include <QQmlEngine>
-#include <QCoreApplication>
+#include <QGuiApplication>
 #include <QDir>
 #include <QJsonDocument>
 #include <QQuickItem>
@@ -118,7 +122,7 @@ void TaoView::initAppInfo()
         pInfo->setProperty("appVersion", TaoVer);
         pInfo->setProperty("latestVersion", TaoVer);
         pInfo->setProperty("buildDateTime", TaoDATETIME);
-        pInfo->setProperty("buildRevision", TaoREVISION);
+        pInfo->setProperty("buildRevision", TaoREVISIONSTR);
         pInfo->setProperty("copyRight", VER_LEGALCOPYRIGHT_STR);
         pInfo->setProperty("descript", QString::fromLocal8Bit(VER_FILEDESCRIPTION_STR));
         pInfo->setProperty("compilerVendor", TaoCompilerVendor);

src/TaoQuickApp/Src/TaoView.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "ITaoQuickPlugin.h"
 

src/TaoQuickApp/TaoQuickApp.pri

@@ -1,9 +1,17 @@
+msvc {
+    HEADERS += $$PWD/Ver-u16.h
+    DEFINES += VER_Utf16
+} else {
+    HEADERS += $$PWD/Ver-u8.h
+}
+
 HEADERS += \
     $$PWD/Src/ITaoQuickPlugin.h \
     $$PWD/Src/Logger/Logger.h \
     $$PWD/Src/Logger/LoggerTemplate.h \
-    $$PWD/Src/TaoView.h \
+    $$PWD/Src/TaoView.h
-    $$PWD/Ver.h
+
+
 SOURCES += \
     $$PWD/Src/Logger/Logger.cpp \
     $$PWD/Src/TaoView.cpp \

src/TaoQuickApp/TaoQuickApp.pro

@@ -6,11 +6,6 @@ CONFIG += plugin c++14 qtquickcompiler
 include(../TaoVersion.pri)
 #include(../TaoBundle.pri)
 
-#msvc{
-#    QMAKE_CFLAGS += -source-charset:utf-8
-#    QMAKE_CXXFLAGS += -source-charset:utf-8
-#}
-
 #一部分头文件加入编译预处理，提高编译速度
 msvc {
     CONFIG += precompile_header
@@ -20,19 +15,23 @@ msvc {
     }
 }
 
-win32 {
+msvc{
+    QMAKE_CFLAGS += -source-charset:utf-8
+    QMAKE_CXXFLAGS += -source-charset:utf-8
+}
+win32:!mingw {
     RC_FILE = App.rc
 }
 macos {
     ICON = milk.icns
 }
 
-CONFIG(debug,debug|release){
+CONFIG(debug,debug|release) {
     DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/)
 } else {
     DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/)
 }
-CONFIG(debug,debug|release){
+CONFIG(debug,debug|release) {
     MOC_DIR = build/debug/moc
     RCC_DIR = build/debug/rcc
     UI_DIR = build/debug/ui

src/TaoQuickApp/Ver-u8.h

@@ -9,6 +9,8 @@
 #define RELEASE_VER_MAIN2 TaoMIN
 #define RELEASE_VER_SUB  TaoPAT
 
+#define FILE_VER_STR TaoREVISIONSTR
+
 #define VER_COMPANYNAME_STR        "JaredTao\0"
 
 #define VER_FILEDESCRIPTION_STR    "TaoQuickDemo,未经授权不得商用,侵权必究\0"

src/TaoVersion.pri

@@ -1,11 +1,19 @@
+isEmpty(TaoVersionInclude) {
+TaoVersionInclude=1
 TAO_VERSION_TAG = 1.0
 
 # current commit hash
 REVISION=$$system("git rev-parse HEAD")
 REVISION=$$str_member($${REVISION}, 0, $$num_add(10, -1))
+isEmpty(REVISION) {
+    REVISION = 0000000000
+}
 
 # last tag
 Ver=$$system("git describe --abbrev=0 --tags")
+isEmpty(Ver) {
+    Ver=0.0.0
+}
 VerList =$$split(Ver, .)
 MAJ = $$take_first(VerList)
 MIN = $$take_first(VerList)
@@ -17,7 +25,8 @@ equals(TEMPLATE, lib) {
     VER_PAT = $${PAT}
     VERSION = $${Ver}
 }
-DEFINES += TaoREVISION=\"\\\"$${REVISION}\\\"\"
+DEFINES += TaoREVISION=$${REVISION}
+DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\"
 DEFINES += TaoVer=\"\\\"$${Ver}\\\"\"
 DEFINES += TaoMAJ=$${MAJ}
 DEFINES += TaoMIN=$${MIN}
@@ -25,3 +34,4 @@ DEFINES += TaoPAT=$${PAT}
 DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\"
 DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\"
 #    message($${DEFINES})
+}

src/src.pro

@@ -4,4 +4,3 @@ SUBDIRS += \
     TaoQuickApp \
     TaoQuickPlugin \
     TaoEffectPlugin
-CONFIG += ordered