Conflicts: src/corelib/io/qwindowspipewriter.cpp src/widgets/styles/qcommonstyle.cpp Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6 |
||
|---|---|---|
| .. | ||
| testdata | ||
| .gitignore | ||
| evaltest.cpp | ||
| parsertest.cpp | ||
| qmakelib.pro | ||
| tst_qmakelib.cpp | ||
| tst_qmakelib.h | ||
Conflicts: src/corelib/io/qwindowspipewriter.cpp src/widgets/styles/qcommonstyle.cpp Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6 |
||
|---|---|---|
| .. | ||
| testdata | ||
| .gitignore | ||
| evaltest.cpp | ||
| parsertest.cpp | ||
| qmakelib.pro | ||
| tst_qmakelib.cpp | ||
| tst_qmakelib.h | ||