qt5base-lts/tests/auto/widgets/graphicsview
Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
	src/corelib/io/qiodevice.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux_p.h
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/tools/bootstrap/bootstrap.pro
	src/widgets/styles/qmacstyle_mac.mm

Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
2014-11-24 13:39:13 +01:00
..
qgraphicsanchorlayout Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicsanchorlayout1 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicseffectsource Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicsgridlayout Adjust the layout if a QGraphicsWidget is explicitly hidden 2014-10-23 07:17:50 +02:00
qgraphicsitem Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicsitemanimation Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicslayout Adjust the layout if a QGraphicsWidget is explicitly hidden 2014-10-23 07:17:50 +02:00
qgraphicslayoutitem Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicslinearlayout Adjust the layout if a QGraphicsWidget is explicitly hidden 2014-10-23 07:17:50 +02:00
qgraphicsobject Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicspixmapitem Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicspolygonitem Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicsproxywidget Fix QWidget::mapTo/FromGlobal() when embedded in QGraphicsView. 2014-10-23 06:33:10 +02:00
qgraphicsscene QGraphicsScene: stabilize stacking order of toplevel items 2014-10-24 22:02:18 +02:00
qgraphicssceneindex Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicstransform Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qgraphicsview Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
qgraphicswidget Update license headers and add new license files 2014-09-24 12:26:19 +02:00
graphicsview.pro Re-enable tests tst_qgraphicsproxywidget, tst_qgraphicswidget. 2013-07-24 22:16:58 +02:00