Conflicts: .qmake.conf src/corelib/kernel/qeventdispatcher_cf.mm src/gui/kernel/qguiapplication_p.h src/gui/kernel/qwindowsysteminterface.cpp src/gui/kernel/qwindowsysteminterface.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnswindowdelegate.mm src/plugins/platforms/ios/qioseventdispatcher.mm src/plugins/platforms/windows/qwindowsdrag.h src/plugins/platforms/windows/qwindowsinternalmimedata.h src/plugins/platforms/windows/qwindowsmime.cpp src/plugins/platforms/winrt/qwinrtscreen.cpp Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246 |
||
|---|---|---|
| .. | ||
| testData/render | ||
| .gitignore | ||
| Ash_European.jpg | ||
| BLACKLIST | ||
| graphicsScene_selection.data | ||
| images.qrc | ||
| qgraphicsscene.pro | ||
| testdata.qrc | ||
| tst_qgraphicsscene.cpp | ||