From b562ff5053896e0954d24036ec7056c6334a84f1 Mon Sep 17 00:00:00 2001 From: wuyize Date: Tue, 7 Feb 2023 20:50:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArchitectureColoredPainting.sln | 27 ++++ .../ArchitectureColoredPainting.vcxproj | 4 +- UnitTest/Qt.runsettings.tt | 11 ++ UnitTest/Qt.x64.runsettings | 8 ++ UnitTest/UnitTest.cpp | 34 +++++ UnitTest/UnitTest.ui | 28 ++++ UnitTest/UnitTest.vcxproj | 126 ++++++++++++++++++ UnitTest/UnitTest.vcxproj.filters | 36 +++++ 8 files changed, 272 insertions(+), 2 deletions(-) create mode 100644 UnitTest/Qt.runsettings.tt create mode 100644 UnitTest/Qt.x64.runsettings create mode 100644 UnitTest/UnitTest.cpp create mode 100644 UnitTest/UnitTest.ui create mode 100644 UnitTest/UnitTest.vcxproj create mode 100644 UnitTest/UnitTest.vcxproj.filters diff --git a/ArchitectureColoredPainting.sln b/ArchitectureColoredPainting.sln index a700f6a..7cb4526 100644 --- a/ArchitectureColoredPainting.sln +++ b/ArchitectureColoredPainting.sln @@ -9,24 +9,51 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FramelessHelperCore", "Fram EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FramelessHelperWidgets", "FramelessHelper\qmake\FramelessHelperWidgets\FramelessHelperWidgets.vcxproj", "{E7A71E05-4AA5-31DB-A17D-542FC7BD83A3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest\UnitTest.vcxproj", "{C81742B7-2428-4329-BEA8-01E4B985810A}" + ProjectSection(ProjectDependencies) = postProject + {3FE96A33-2BB7-4686-A710-3EB8E3BBD709} = {3FE96A33-2BB7-4686-A710-3EB8E3BBD709} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3FE96A33-2BB7-4686-A710-3EB8E3BBD709}.Debug|x64.ActiveCfg = Debug|x64 {3FE96A33-2BB7-4686-A710-3EB8E3BBD709}.Debug|x64.Build.0 = Debug|x64 + {3FE96A33-2BB7-4686-A710-3EB8E3BBD709}.Debug|x86.ActiveCfg = Debug|x64 + {3FE96A33-2BB7-4686-A710-3EB8E3BBD709}.Debug|x86.Build.0 = Debug|x64 {3FE96A33-2BB7-4686-A710-3EB8E3BBD709}.Release|x64.ActiveCfg = Release|x64 {3FE96A33-2BB7-4686-A710-3EB8E3BBD709}.Release|x64.Build.0 = Release|x64 + {3FE96A33-2BB7-4686-A710-3EB8E3BBD709}.Release|x86.ActiveCfg = Release|x64 + {3FE96A33-2BB7-4686-A710-3EB8E3BBD709}.Release|x86.Build.0 = Release|x64 {954D3D24-DF86-33A3-8867-D1735CCBDB10}.Debug|x64.ActiveCfg = Debug|x64 {954D3D24-DF86-33A3-8867-D1735CCBDB10}.Debug|x64.Build.0 = Debug|x64 + {954D3D24-DF86-33A3-8867-D1735CCBDB10}.Debug|x86.ActiveCfg = Debug|x64 + {954D3D24-DF86-33A3-8867-D1735CCBDB10}.Debug|x86.Build.0 = Debug|x64 {954D3D24-DF86-33A3-8867-D1735CCBDB10}.Release|x64.ActiveCfg = Release|x64 {954D3D24-DF86-33A3-8867-D1735CCBDB10}.Release|x64.Build.0 = Release|x64 + {954D3D24-DF86-33A3-8867-D1735CCBDB10}.Release|x86.ActiveCfg = Release|x64 + {954D3D24-DF86-33A3-8867-D1735CCBDB10}.Release|x86.Build.0 = Release|x64 {E7A71E05-4AA5-31DB-A17D-542FC7BD83A3}.Debug|x64.ActiveCfg = Debug|x64 {E7A71E05-4AA5-31DB-A17D-542FC7BD83A3}.Debug|x64.Build.0 = Debug|x64 + {E7A71E05-4AA5-31DB-A17D-542FC7BD83A3}.Debug|x86.ActiveCfg = Debug|x64 + {E7A71E05-4AA5-31DB-A17D-542FC7BD83A3}.Debug|x86.Build.0 = Debug|x64 {E7A71E05-4AA5-31DB-A17D-542FC7BD83A3}.Release|x64.ActiveCfg = Release|x64 {E7A71E05-4AA5-31DB-A17D-542FC7BD83A3}.Release|x64.Build.0 = Release|x64 + {E7A71E05-4AA5-31DB-A17D-542FC7BD83A3}.Release|x86.ActiveCfg = Release|x64 + {E7A71E05-4AA5-31DB-A17D-542FC7BD83A3}.Release|x86.Build.0 = Release|x64 + {C81742B7-2428-4329-BEA8-01E4B985810A}.Debug|x64.ActiveCfg = Debug|x64 + {C81742B7-2428-4329-BEA8-01E4B985810A}.Debug|x64.Build.0 = Debug|x64 + {C81742B7-2428-4329-BEA8-01E4B985810A}.Debug|x86.ActiveCfg = Debug|x64 + {C81742B7-2428-4329-BEA8-01E4B985810A}.Debug|x86.Build.0 = Debug|x64 + {C81742B7-2428-4329-BEA8-01E4B985810A}.Release|x64.ActiveCfg = Release|x64 + {C81742B7-2428-4329-BEA8-01E4B985810A}.Release|x64.Build.0 = Release|x64 + {C81742B7-2428-4329-BEA8-01E4B985810A}.Release|x86.ActiveCfg = Release|x64 + {C81742B7-2428-4329-BEA8-01E4B985810A}.Release|x86.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj index e6bb481..20f28b2 100644 --- a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj +++ b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj @@ -32,7 +32,7 @@ 5.15.2_msvc2019_64 - core;xml;gui;svg;widgets;winextras + core;xml;gui;svg;widgets; debug @@ -68,7 +68,7 @@ stdcpp20 - $(SolutionDir)ArchitectureColoredPainting\src\Editor\RightBar;$(SolutionDir)ArchitectureColoredPainting\src\Editor\;$(SolutionDir)QGoodWindow;$(SolutionDir)FramelessHelper\include;$(SolutionDir)FramelessHelper\qmake\inc\core;$(SolutionDir)FramelessHelper\include\FramelessHelper\Core;%(AdditionalIncludeDirectories) + $(SolutionDir)ArchitectureColoredPainting\src\Editor\RightBar;$(SolutionDir)ArchitectureColoredPainting\src\Editor\;$(SolutionDir)FramelessHelper\include;$(SolutionDir)FramelessHelper\qmake\inc\core;$(SolutionDir)FramelessHelper\include\FramelessHelper\Core;%(AdditionalIncludeDirectories) FRAMELESSHELPER_WIDGETS_STATIC;%(PreprocessorDefinitions) diff --git a/UnitTest/Qt.runsettings.tt b/UnitTest/Qt.runsettings.tt new file mode 100644 index 0000000..8541977 --- /dev/null +++ b/UnitTest/Qt.runsettings.tt @@ -0,0 +1,11 @@ +<#@ template language="c#" hostspecific="true" #> +<#@ output extension=".runsettings" #> +<#@ parameter type="System.String" name="QtDllPath" #> + + + + + %PATH%;<#= QtDllPath #> + + + \ No newline at end of file diff --git a/UnitTest/Qt.x64.runsettings b/UnitTest/Qt.x64.runsettings new file mode 100644 index 0000000..13451a6 --- /dev/null +++ b/UnitTest/Qt.x64.runsettings @@ -0,0 +1,8 @@ + + + + + %PATH%;E:/Qt/5.15.2/msvc2019_64/bin + + + \ No newline at end of file diff --git a/UnitTest/UnitTest.cpp b/UnitTest/UnitTest.cpp new file mode 100644 index 0000000..a03f793 --- /dev/null +++ b/UnitTest/UnitTest.cpp @@ -0,0 +1,34 @@ +#include "CppUnitTest.h" +#include "MainWindow.h" +#include +#include +#include + + +using namespace Microsoft::VisualStudio::CppUnitTestFramework; + +namespace UnitTest +{ + TEST_CLASS(UnitTest) + { + public: + TEST_METHOD(TestMethod1) + { + FRAMELESSHELPER_USE_NAMESPACE + FramelessHelper::Core::initialize(); + //QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); + char arg[] = ""; + char* argv[] = { arg }; + int argc = 1; + QApplication a(argc, argv); + FramelessHelper::Core::setApplicationOSThemeAware(); + FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur); + FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow); + FramelessConfig::instance()->set(Global::Option::CenterWindowBeforeShow); + MainWindow w; + w.show(); + a.exec(); + } + }; +} diff --git a/UnitTest/UnitTest.ui b/UnitTest/UnitTest.ui new file mode 100644 index 0000000..3ca383d --- /dev/null +++ b/UnitTest/UnitTest.ui @@ -0,0 +1,28 @@ + + UnitTestClass + + + UnitTestClass + + + + 0 + 0 + 600 + 400 + + + + UnitTest + + + + + + + + + + + + diff --git a/UnitTest/UnitTest.vcxproj b/UnitTest/UnitTest.vcxproj new file mode 100644 index 0000000..b7ba805 --- /dev/null +++ b/UnitTest/UnitTest.vcxproj @@ -0,0 +1,126 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {C81742B7-2428-4329-BEA8-01E4B985810A} + QtVS_v304 + 10.0 + 10.0 + $(MSBuildProjectDirectory)\QtMsBuild + + + + DynamicLibrary + v143 + + + DynamicLibrary + v143 + + + + + + + 5.15.2_msvc2019_64 + core;xml;gui;svg;widgets; + debug + + + 5.15.2_msvc2019_64 + core;gui;widgets + release + + + $(MSBuildProjectDirectory)\Qt.$(Platform).runsettings + true + + + + + + + + + + + + + + + + + + + + + + stdcpp20 + $(VCInstallDir)UnitTest\include;$(SolutionDIr)ArchitectureColoredPainting;$(SolutionDIr)ArchitectureColoredPainting\src;$(SolutionDir)ArchitectureColoredPainting\src\Editor\RightBar;$(SolutionDir)ArchitectureColoredPainting\src\Editor\;$(SolutionDIr)ArchitectureColoredPainting\x64\Debug\uic;$(SolutionDir)FramelessHelper\include;$(SolutionDir)FramelessHelper\qmake\inc\core;$(SolutionDir)FramelessHelper\include\FramelessHelper\Core;%(AdditionalIncludeDirectories) + FRAMELESSHELPER_WIDGETS_STATIC;_DEBUG;%(PreprocessorDefinitions) + + + $(SolutionDIr)ArchitectureColoredPainting\x64\Debug\*.obj;$(SolutionDIr)FramelessHelper\qmake\FramelessHelperCore\debug\FramelessHelperCore.lib;$(SolutionDIr)FramelessHelper\qmake\FramelessHelperWidgets\debug\FramelessHelperWidgets.lib;%(AdditionalDependencies) + + + + + stdcpp20 + $(VCInstallDir)UnitTest\include;$(SolutionDIr)ArchitectureColoredPainting\ArchitectureColoredPainting;$(SolutionDIr)ArchitectureColoredPainting\ArchitectureColoredPainting\src;%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + + + true + true + EditAndContinue + Disabled + + + Windows + true + + + + + true + true + None + MaxSpeed + + + Windows + false + + + + + + + + + TextTemplatingFileGenerator + $(MSBuildProjectDirectory)\Qt.$(Platform).runsettings + + + $(QtDllPath) + + + + + + + + + + \ No newline at end of file diff --git a/UnitTest/UnitTest.vcxproj.filters b/UnitTest/UnitTest.vcxproj.filters new file mode 100644 index 0000000..3d88512 --- /dev/null +++ b/UnitTest/UnitTest.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + qml;cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + qrc;rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {99349809-55BA-4b9d-BF79-8FDBB0286EB3} + ui + + + {639EADAA-A684-42e4-A9AD-28FC9BCB8F7C} + ts + + + + + Form Files + + + Source Files + + + + + + \ No newline at end of file