Conflicts: tests/auto/corelib/io/qprocess/tst_qprocess.cpp Change-Id: Ib6955eb874b516b185b45d6c38cec646fbaa95f4 |
||
|---|---|---|
| .. | ||
| dialogs | ||
| kernel | ||
| printsupport.pro | ||
Conflicts: tests/auto/corelib/io/qprocess/tst_qprocess.cpp Change-Id: Ib6955eb874b516b185b45d6c38cec646fbaa95f4 |
||
|---|---|---|
| .. | ||
| dialogs | ||
| kernel | ||
| printsupport.pro | ||