Conflicts: src/corelib/global/qglobal.cpp Change-Id: I375fa4afa662fa411a15f212ebd5f2f0dffdba7f |
||
|---|---|---|
| .. | ||
| extras | ||
| platforms | ||
| qfileselector.pro | ||
| qfileselector.qrc | ||
| tst_qfileselector.cpp | ||
Conflicts: src/corelib/global/qglobal.cpp Change-Id: I375fa4afa662fa411a15f212ebd5f2f0dffdba7f |
||
|---|---|---|
| .. | ||
| extras | ||
| platforms | ||
| qfileselector.pro | ||
| qfileselector.qrc | ||
| tst_qfileselector.cpp | ||