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
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qgraphicsview.pro	Enable tst_QGraphicsView on OSX	2014-11-19 16:13:43 +01:00
tst_qgraphicsview_2.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
tst_qgraphicsview.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
tst_qgraphicsview.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00