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