afab1546a7
Conflicts: qmake/doc/snippets/code/doc_src_qmake-manual.pro qmake/doc/src/qmake-manual.qdoc src/corelib/io/qstorageinfo_unix.cpp src/corelib/tools/qbytearray.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp tests/auto/network/access/qnetworkreply/BLACKLIST Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c |
||
---|---|---|
.. | ||
alwaysoptimize | ||
defaultoptimize | ||
forceoptimize | ||
.gitignore | ||
qregularexpression.pro | ||
tst_qregularexpression.cpp | ||
tst_qregularexpression.h |