96232be146
Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296 |
||
---|---|---|
.. | ||
configure_pch.h | ||
configure.pro | ||
configureapp.cpp | ||
configureapp.h | ||
environment.cpp | ||
environment.h | ||
main.cpp | ||
Makefile.mingw | ||
Makefile.win32 | ||
tools.cpp | ||
tools.h |