Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/tools/qstring.h src/gui/image/qimagereader.cpp src/network/access/qnetworkaccessmanager.cpp src/tools/qdoc/doc/examples/examples.qdoc src/widgets/accessible/qaccessiblewidgetfactory_p.h src/widgets/doc/qtwidgets.qdocconf Change-Id: I8fae62283aebefe24e5ca4b4abd97386560c0fcb |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qcoreapplication.pro | ||
| tst_qcoreapplication.cpp | ||
| tst_qcoreapplication.h | ||