Conflicts: examples/widgets/graphicsview/elasticnodes/graphwidget.cpp examples/widgets/graphicsview/elasticnodes/node.cpp examples/widgets/graphicsview/elasticnodes/node.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_drawing.mm src/widgets/kernel/qmacgesturerecognizer_p.h Change-Id: I13cf06bac75d48d779d8ee7b5c91bfc976f2a32c |
||
|---|---|---|
| .. | ||
| colorswatch.cpp | ||
| colorswatch.h | ||
| main.cpp | ||
| mainwindow.cpp | ||
| mainwindow.h | ||
| mainwindow.pro | ||
| mainwindow.qrc | ||
| qt.png | ||
| titlebarCenter.png | ||
| titlebarLeft.png | ||
| titlebarRight.png | ||
| toolbar.cpp | ||
| toolbar.h | ||