From 5483b00a40fef2d47640bcee76b4429368e17c08 Mon Sep 17 00:00:00 2001 From: jared Date: Sat, 20 Jun 2020 01:41:26 +0800 Subject: [PATCH] update prf --- mkspecs/features/taoVersion.prf | 11 +++++++---- src/TaoQuickApp/Qml/MainPage.qml | 20 ++++++++++---------- src/TaoQuickApp/TaoQuickApp.pri | 7 ++----- src/src.pro | 1 + 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/mkspecs/features/taoVersion.prf b/mkspecs/features/taoVersion.prf index 88d5b27..d2d8694 100644 --- a/mkspecs/features/taoVersion.prf +++ b/mkspecs/features/taoVersion.prf @@ -19,10 +19,13 @@ MAJ = $$take_first(VerList) MIN = $$take_first(VerList) PAT = $$take_first(VerList) -# VER_MAJ = $${MAJ} -# VER_MIN = $${MIN} -# VER_PAT = $${PAT} -# VERSION = $${Ver} + equals(TEMPLATE, lib) { + CONFIG += skip_target_version_ext + VER_MAJ = $${MAJ} + VER_MIN = $${MIN} + VER_PAT = $${PAT} + VERSION = $${Ver} + } DEFINES += TaoREVISION=$${REVISION} DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\" diff --git a/src/TaoQuickApp/Qml/MainPage.qml b/src/TaoQuickApp/Qml/MainPage.qml index c4e98a8..3f9c5a1 100644 --- a/src/TaoQuickApp/Qml/MainPage.qml +++ b/src/TaoQuickApp/Qml/MainPage.qml @@ -71,14 +71,14 @@ Item { NotifyBox { id: notifyBox } - ShaderEffectSource { - anchors { - right: parent.right - bottom: parent.bottom - } - sourceItem: rootView - width: 300 - height: width / rootView.width * rootView.height - recursive: true - } +// ShaderEffectSource { +// anchors { +// right: parent.right +// bottom: parent.bottom +// } +// sourceItem: rootView +// width: 300 +// height: width / rootView.width * rootView.height +// recursive: true +// } } diff --git a/src/TaoQuickApp/TaoQuickApp.pri b/src/TaoQuickApp/TaoQuickApp.pri index 280ae0d..8dd874b 100644 --- a/src/TaoQuickApp/TaoQuickApp.pri +++ b/src/TaoQuickApp/TaoQuickApp.pri @@ -11,17 +11,14 @@ CONFIG += file_copies # HEADERS += $$PWD/Ver-u8.h #} -msvc{ +msvc { QMAKE_CFLAGS += -source-charset:utf-8 QMAKE_CXXFLAGS += -source-charset:utf-8 } #一部分头文件加入编译预处理,提高编译速度 -msvc { +msvc | gcc | xcode { CONFIG += precompile_header PRECOMPILED_HEADER = $$PWD/Src/stdafx.h - precompile_header:!isEmpty(PRECOMPILED_HEADER) { - DEFINES += USING_PCH - } } HEADERS += \ diff --git a/src/src.pro b/src/src.pro index 08eac5d..44d0787 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,3 +4,4 @@ SUBDIRS += \ TaoQuickApp \ TaoQuickPlugin \ TaoEffectPlugin +CONFIG+= ordered