Conflicts: examples/network/bearermonitor/CMakeLists.txt examples/network/CMakeLists.txt src/corelib/tools/qlinkedlist.h src/sql/kernel/qsqldriver_p.h src/sql/kernel/qsqlresult_p.h src/widgets/kernel/qwidget.cpp src/widgets/kernel/qwidget_p.h tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp tests/auto/tools/moc/allmocs_baseline_in.json Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9 |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| lightmaps.cpp | ||
| lightmaps.h | ||
| lightmaps.pro | ||
| main.cpp | ||
| mapzoom.cpp | ||
| mapzoom.h | ||
| slippymap.cpp | ||
| slippymap.h | ||