AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fc35f71434
qt5base-lts/tests/auto/widgets/graphicsview
History
Frederik Gladhorn fc35f71434 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
	src/gui/image/qimage_conversions.cpp
	src/gui/opengl/qopenglextensions_p.h
	src/gui/text/qtextengine.cpp
	src/network/ssl/qsslsocket_openssl.cpp
	src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
	src/plugins/platforms/eglfs/qeglfsscreen.cpp
	src/plugins/platforms/eglfs/qeglfswindow.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
	src/plugins/platforms/windows/qwindowsnativeinterface.cpp
	src/plugins/platforms/windows/qwindowsscreen.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/plugins/platforms/windows/qwindowswindow.h
	src/plugins/platforms/xcb/qxcbdrag.h
	src/widgets/itemviews/qabstractitemview.cpp
	src/widgets/kernel/qwidget.cpp
	src/widgets/util/qsystemtrayicon_p.h
	tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp

Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp
conflicts.

Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
2015-02-10 09:42:25 +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 Fixed a bug where spans did not always work in layouts. 2014-12-09 16:58:58 +01:00
qgraphicsitem Extend selections in QGraphicsView when selection extension key down 2015-01-13 13:04:40 +01: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 Merge remote-tracking branch 'origin/5.4' into dev 2015-02-10 09:42:25 +01: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 Extend selections in QGraphicsView when selection extension key down 2015-01-13 13:04:40 +01:00
qgraphicswidget Fix QGraphicsWidget window frame section logic 2015-02-02 21:38:23 +00:00
graphicsview.pro Re-enable tests tst_qgraphicsproxywidget, tst_qgraphicswidget. 2013-07-24 22:16:58 +02:00