b894a8def5
Conflicts: mkspecs/features/qml_module.prf mkspecs/features/qt_common.prf src/gui/text/qzip.cpp src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/windows/array.h src/testlib/qtestcase.cpp src/widgets/dialogs/qfilesystemmodel.h Change-Id: Ie41c5868415b81f7693c80e045497035504bb210 |
||
---|---|---|
.. | ||
.gitignore | ||
baseclass.cpp | ||
baseclass.h | ||
compiler.pro | ||
derivedclass.cpp | ||
derivedclass.h | ||
othersource.cpp | ||
tst_compiler.cpp |