Conflicts: src/corelib/kernel/qcoreapplication.cpp src/corelib/thread/qthread_unix.cpp Change-Id: Ia08d613c3f0bd08cb6dc3e3a57257207dfd4a099 |
||
|---|---|---|
| .. | ||
| testdata | ||
| .gitignore | ||
| qmake.pro | ||
| testcompiler.cpp | ||
| testcompiler.h | ||
| tst_qmake.cpp | ||
Conflicts: src/corelib/kernel/qcoreapplication.cpp src/corelib/thread/qthread_unix.cpp Change-Id: Ia08d613c3f0bd08cb6dc3e3a57257207dfd4a099 |
||
|---|---|---|
| .. | ||
| testdata | ||
| .gitignore | ||
| qmake.pro | ||
| testcompiler.cpp | ||
| testcompiler.h | ||
| tst_qmake.cpp | ||