From 7c0f9b58ab5c7ae5f157c4d1a55e31c4d911c021 Mon Sep 17 00:00:00 2001 From: lpt <463045863@qq.com> Date: 星期三, 30 七月 2025 09:18:50 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719 --- Server/杜国庆/code/BackgroundMon/BackgroundMon.pro.user | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git "a/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro.user" "b/Server/\346\235\234\345\233\275\345\272\206/code/BackgroundMon/BackgroundMon.pro.user" similarity index 96% rename from "Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro.user" rename to "Server/\346\235\234\345\233\275\345\272\206/code/BackgroundMon/BackgroundMon.pro.user" index 82b3c83..50ce93a 100644 --- "a/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro.user" +++ "b/Server/\346\235\234\345\233\275\345\272\206/code/BackgroundMon/BackgroundMon.pro.user" @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 4.5.0, 2025-07-25T18:29:49. --> +<!-- Written by QtCreator 4.5.0, 2025-07-28T18:06:13. --> <qtcreator> <data> <variable>EnvironmentId</variable> @@ -66,7 +66,7 @@ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MinGW_32bit-Debug</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MinGW_32bit-Debug</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -120,7 +120,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MinGW_32bit-Release</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MinGW_32bit-Release</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -174,7 +174,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MinGW_32bit-Profile</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MinGW_32bit-Profile</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -284,15 +284,15 @@ </valuelist> <value type="int" key="PE.EnvironmentAspect.Base">2</value> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">BG_Mon_Subsystem</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">BackgroundMon</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro</value> + <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:E:/Qt/QtProject/BackgroundMon/BackgroundMon.pro</value> <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">BG_Mon_Subsystem.pro</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">BackgroundMon.pro</value> <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> - <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MinGW_32bit-Debug</value> + <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MinGW_32bit-Debug</value> <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> @@ -313,7 +313,7 @@ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MSVC2015_32bit-Debug</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MSVC2015_32bit-Debug</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -367,7 +367,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MSVC2015_32bit-Release</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MSVC2015_32bit-Release</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -421,7 +421,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MSVC2015_32bit-Profile</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MSVC2015_32bit-Profile</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -557,7 +557,7 @@ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MSVC2015_64bit-Debug</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MSVC2015_64bit-Debug</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -611,7 +611,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MSVC2015_64bit-Release</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MSVC2015_64bit-Release</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> @@ -665,7 +665,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> - <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MSVC2015_64bit-Profile</value> + <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Qt/QtProject/build-BackgroundMon-Desktop_Qt_5_9_4_MSVC2015_64bit-Profile</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> -- Gitblit v1.8.0