Conflicts: src/corelib/io/qprocess_win.cpp Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9 |
||
|---|---|---|
| .. | ||
| testdata | ||
| .gitignore | ||
| evaltest.cpp | ||
| parsertest.cpp | ||
| qmakelib.pro | ||
| tst_qmakelib.cpp | ||
| tst_qmakelib.h | ||
Conflicts: src/corelib/io/qprocess_win.cpp Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9 |
||
|---|---|---|
| .. | ||
| testdata | ||
| .gitignore | ||
| evaltest.cpp | ||
| parsertest.cpp | ||
| qmakelib.pro | ||
| tst_qmakelib.cpp | ||
| tst_qmakelib.h | ||