Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719

jiubingdao

2025-07-29 7d505651f87270f40882dc6b2358e4fde5d87eca

 Server/付林涛/code/build-tianKai-Desktop_Qt_5_9_4_MinGW_32bit-Debug/Makefile

@@ -237,6 +237,7 @@
      ../../Qt5.9.4/5.9.4/mingw53_32/lib/qtmaind.prl \
      ../../Qt5.9.4/5.9.4/mingw53_32/lib/Qt5Widgets.prl \
      ../../Qt5.9.4/5.9.4/mingw53_32/lib/Qt5Gui.prl \
      ../../Qt5.9.4/5.9.4/mingw53_32/lib/Qt5Network.prl \
      ../../Qt5.9.4/5.9.4/mingw53_32/lib/Qt5Core.prl
   $(QMAKE) -o Makefile ..\tianKai\tianKai.pro -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug"
../../Qt5.9.4/5.9.4/mingw53_32/mkspecs/features/spec_pre.prf:
@@ -415,6 +416,7 @@
../../Qt5.9.4/5.9.4/mingw53_32/lib/qtmaind.prl:
../../Qt5.9.4/5.9.4/mingw53_32/lib/Qt5Widgets.prl:
../../Qt5.9.4/5.9.4/mingw53_32/lib/Qt5Gui.prl:
../../Qt5.9.4/5.9.4/mingw53_32/lib/Qt5Network.prl:
../../Qt5.9.4/5.9.4/mingw53_32/lib/Qt5Core.prl:
qmake: FORCE
   @$(QMAKE) -o Makefile ..\tianKai\tianKai.pro -spec win32-g++ "CONFIG+=debug" "CONFIG+=qml_debug"