Conflicts: mkspecs/common/linux-android.conf src/gui/opengl/qopengl.h src/network/socket/qnativesocketengine_winrt.cpp src/network/socket/qnativesocketengine_winrt_p.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/api/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp sync.profile Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4 |
||
|---|---|---|
| .. | ||
| arch | ||
| common | ||
| mac/corewlan | ||
| qpa | ||
| unix | ||
| win | ||
| x11 | ||
| .gitignore | ||
| .qmake.conf | ||