消除合并后bug
commit
0696431bc6
@ -0,0 +1 @@
|
|||||||
|
/build/
|
File diff suppressed because one or more lines are too long
@ -1,21 +0,0 @@
|
|||||||
QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
|
|
||||||
QMAKE_CXX.QMAKE_MSC_VER = 1935
|
|
||||||
QMAKE_CXX.QMAKE_MSC_FULL_VER = 193532217
|
|
||||||
QMAKE_CXX.COMPILER_MACROS = \
|
|
||||||
QT_COMPILER_STDCXX \
|
|
||||||
QMAKE_MSC_VER \
|
|
||||||
QMAKE_MSC_FULL_VER
|
|
||||||
QMAKE_CXX.INCDIRS = \
|
|
||||||
"D:\\Microsoft Visual Studio\\IDE\\VC\\Tools\\MSVC\\14.35.32215\\include" \
|
|
||||||
"D:\\Microsoft Visual Studio\\IDE\\VC\\Tools\\MSVC\\14.35.32215\\ATLMFC\\include" \
|
|
||||||
"D:\\Microsoft Visual Studio\\IDE\\VC\\Auxiliary\\VS\\include" \
|
|
||||||
"D:\\Windows Kits\\10\\include\\10.0.22621.0\\ucrt" \
|
|
||||||
"D:\\Windows Kits\\10\\\\include\\10.0.22621.0\\\\um" \
|
|
||||||
"D:\\Windows Kits\\10\\\\include\\10.0.22621.0\\\\shared" \
|
|
||||||
"D:\\Windows Kits\\10\\\\include\\10.0.22621.0\\\\winrt" \
|
|
||||||
"D:\\Windows Kits\\10\\\\include\\10.0.22621.0\\\\cppwinrt"
|
|
||||||
QMAKE_CXX.LIBDIRS = \
|
|
||||||
"D:\\Microsoft Visual Studio\\IDE\\VC\\Tools\\MSVC\\14.35.32215\\ATLMFC\\lib\\x64" \
|
|
||||||
"D:\\Microsoft Visual Studio\\IDE\\VC\\Tools\\MSVC\\14.35.32215\\lib\\x64" \
|
|
||||||
"D:\\Windows Kits\\10\\lib\\10.0.22621.0\\ucrt\\x64" \
|
|
||||||
"D:\\Windows Kits\\10\\\\lib\\10.0.22621.0\\\\um\\x64"
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue