Conflicts: mkspecs/features/qt_common.prf src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: I03b92b6b89ecc5a8db7c95f04ebb92ed198098a8 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| baseclass.cpp | ||
| baseclass.h | ||
| compiler.pro | ||
| derivedclass.cpp | ||
| derivedclass.h | ||
| othersource.cpp | ||
| tst_compiler.cpp | ||