Conflicts: src/corelib/kernel/qeventdispatcher_win.cpp Change-Id: I32db3f755577aefc15f757041367d6144f5e5c66 |
||
|---|---|---|
| .. | ||
| desktopsettingsaware | ||
| modal | ||
| test | ||
| tmp | ||
| .gitignore | ||
| BLACKLIST | ||
| heart.svg | ||
| qapplication.pro | ||
| tst_qapplication.cpp | ||
Conflicts: src/corelib/kernel/qeventdispatcher_win.cpp Change-Id: I32db3f755577aefc15f757041367d6144f5e5c66 |
||
|---|---|---|
| .. | ||
| desktopsettingsaware | ||
| modal | ||
| test | ||
| tmp | ||
| .gitignore | ||
| BLACKLIST | ||
| heart.svg | ||
| qapplication.pro | ||
| tst_qapplication.cpp | ||