From 55804277909d3734e1cfbd94c17bc19d37280df3 Mon Sep 17 00:00:00 2001
From: mf <2848019546@qq.com>
Date: 星期一, 23 十二月 2024 16:37:06 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/脸谱AI_0817_1202 This merge integrates the latest updates from the master branch of the remote repository. It includes new features, bug fixes, and performance improvements that were developed in the upstream repository.
---
GroupB_马喜龙/Client/石蕊/code/test_fp_login/test_fp_login.pro.user | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git "a/GroupB_\351\251\254\345\226\234\351\276\231/Client/\347\237\263\350\225\212/code/test_fp_login/test_fp_login.pro.user" "b/GroupB_\351\251\254\345\226\234\351\276\231/Client/\347\237\263\350\225\212/code/test_fp_login/test_fp_login.pro.user"
index 3ddd095..eacc84c 100644
--- "a/GroupB_\351\251\254\345\226\234\351\276\231/Client/\347\237\263\350\225\212/code/test_fp_login/test_fp_login.pro.user"
+++ "b/GroupB_\351\251\254\345\226\234\351\276\231/Client/\347\237\263\350\225\212/code/test_fp_login/test_fp_login.pro.user"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.0, 2024-12-03T15:43:39. -->
+<!-- Written by QtCreator 4.5.0, 2024-12-05T11:49:36. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -285,8 +285,8 @@
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">test_fp_login</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Qt/QtProject/test_fp_login/test_fp_login.pro</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">test_fp_login2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/AI project/鑴歌氨AI_0817_1202/GroupB_椹枩榫�/Client/鐭宠晩/code/test_fp_login/test_fp_login.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">test_fp_login.pro</value>
--
Gitblit v1.8.0