dd756011da
Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f |
||
---|---|---|
.. | ||
qtmain_win.cpp | ||
qtmain_winrt.cpp | ||
winmain.pro |
dd756011da
Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f |
||
---|---|---|
.. | ||
qtmain_win.cpp | ||
qtmain_winrt.cpp | ||
winmain.pro |