627d9cbd3c
Conflicts: src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: I4ca87d44129fa5c1d8541cd58b8d62bc69080688 |
||
---|---|---|
.. | ||
.gitignore | ||
qgraphicsitem.pro | ||
tst_qgraphicsitem.cpp |
627d9cbd3c
Conflicts: src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: I4ca87d44129fa5c1d8541cd58b8d62bc69080688 |
||
---|---|---|
.. | ||
.gitignore | ||
qgraphicsitem.pro | ||
tst_qgraphicsitem.cpp |