Conflicts: src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074 |
||
|---|---|---|
| .. | ||
| arch | ||
| common | ||
| mac/corewlan | ||
| qpa | ||
| unix | ||
| win | ||
| x11 | ||
| .gitignore | ||
| .qmake.conf | ||
Conflicts: src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074 |
||
|---|---|---|
| .. | ||
| arch | ||
| common | ||
| mac/corewlan | ||
| qpa | ||
| unix | ||
| win | ||
| x11 | ||
| .gitignore | ||
| .qmake.conf | ||