From ee692f2cbde18cf221c06e4be5af0f87c40a7104 Mon Sep 17 00:00:00 2001
From: xuetao <xuetao@ng3d.com>
Date: 星期四, 08 五月 2025 16:01:51 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/test-upload
---
Test/mainwindow.cpp | 0
Test/Test.pro | 2 +-
Test/main.cpp | 1 +
Test/mainwindow.h | 0
Test/.gitignore | 0
Test/mainwindow.ui | 0
6 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/QTTest/.gitignore b/Test/.gitignore
similarity index 100%
rename from QTTest/.gitignore
rename to Test/.gitignore
diff --git a/QTTest/QTTest.pro b/Test/Test.pro
similarity index 97%
rename from QTTest/QTTest.pro
rename to Test/Test.pro
index 06b0341..0086fd6 100644
--- a/QTTest/QTTest.pro
+++ b/Test/Test.pro
@@ -1,4 +1,4 @@
-QT += core gui
+QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
diff --git a/QTTest/main.cpp b/Test/main.cpp
similarity index 91%
rename from QTTest/main.cpp
rename to Test/main.cpp
index fd3e533..51ee1a9 100644
--- a/QTTest/main.cpp
+++ b/Test/main.cpp
@@ -4,6 +4,7 @@
int main(int argc, char *argv[])
{
+ //first QT
QApplication a(argc, argv);
MainWindow w;
w.show();
diff --git a/QTTest/mainwindow.cpp b/Test/mainwindow.cpp
similarity index 100%
rename from QTTest/mainwindow.cpp
rename to Test/mainwindow.cpp
diff --git a/QTTest/mainwindow.h b/Test/mainwindow.h
similarity index 100%
rename from QTTest/mainwindow.h
rename to Test/mainwindow.h
diff --git a/QTTest/mainwindow.ui b/Test/mainwindow.ui
similarity index 100%
rename from QTTest/mainwindow.ui
rename to Test/mainwindow.ui
--
Gitblit v1.9.1