Conflicts: src/plugins/platforms/eglfs/qeglfshooks.cpp Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2 |
||
|---|---|---|
| .. | ||
| desktopsettingsaware | ||
| modal | ||
| test | ||
| tmp | ||
| .gitignore | ||
| BLACKLIST | ||
| heart.svg | ||
| qapplication.pro | ||
| tst_qapplication.cpp | ||
Conflicts: src/plugins/platforms/eglfs/qeglfshooks.cpp Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2 |
||
|---|---|---|
| .. | ||
| desktopsettingsaware | ||
| modal | ||
| test | ||
| tmp | ||
| .gitignore | ||
| BLACKLIST | ||
| heart.svg | ||
| qapplication.pro | ||
| tst_qapplication.cpp | ||