AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34b14a8472
qt5base-lts/tests/auto/widgets/graphicsview
History
Frederik Gladhorn 34b14a8472 Merge remote-tracking branch 'origin/5.4' into 5.5 
Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
2015-02-24 21:02:08 +01:00
..
qgraphicsanchorlayout Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicsanchorlayout1 Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicseffectsource Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicsgridlayout Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicsitem Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicsitemanimation Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicslayout Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicslayoutitem Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicslinearlayout Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicsobject Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicspixmapitem Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicspolygonitem Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicsproxywidget Merge remote-tracking branch 'origin/5.4' into 5.5 2015-02-24 21:02:08 +01:00
qgraphicsscene Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicssceneindex Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicstransform Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicsview Update copyright headers 2015-02-11 06:49:51 +00:00
qgraphicswidget Update copyright headers 2015-02-11 06:49:51 +00:00
graphicsview.pro Re-enable tests tst_qgraphicsproxywidget, tst_qgraphicswidget. 2013-07-24 22:16:58 +02:00