Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
|
||
|---|---|---|
| .. | ||
| mac | ||
| unix | ||
| win32 | ||
| makefile.cpp | ||
| makefile.h | ||
| makefiledeps.cpp | ||
| makefiledeps.h | ||
| metamakefile.cpp | ||
| metamakefile.h | ||
| projectgenerator.cpp | ||
| projectgenerator.h | ||
| xmloutput.cpp | ||
| xmloutput.h | ||