082faeff9c
Conflicts: src/gui/image/qpnghandler.cpp Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301 |
||
---|---|---|
.. | ||
doc | ||
generators | ||
library | ||
cachekeys.h | ||
main.cpp | ||
Makefile.unix | ||
Makefile.unix.macos | ||
Makefile.unix.mingw | ||
Makefile.unix.unix | ||
Makefile.unix.win32 | ||
Makefile.win32 | ||
meta.cpp | ||
meta.h | ||
option.cpp | ||
option.h | ||
project.cpp | ||
project.h | ||
property.cpp | ||
property.h | ||
qmake_pch.h | ||
qmake-aux.pro | ||
qmake.pro |