ce09ef4313
Conflicts: src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/windows/qwindowscontext.cpp src/plugins/platforms/windows/windows.pri src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/doc/src/widgets-and-layouts/gallery.qdoc Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f |
||
---|---|---|
.. | ||
arch | ||
common | ||
mac/corewlan | ||
qpa | ||
unix | ||
win | ||
x11 | ||
.gitignore | ||
.qmake.conf |