Liang Qi 6cb8121a44 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/styles/qgtkstyle_p.cpp tests/auto/corelib/io/qtextstream/test/test.pro tests/auto/corelib/plugin/plugin.pro Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b		2016-03-21 09:02:57 +01:00
..
dragwidget.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
dragwidget.h	Updated license headers	2016-01-21 18:55:18 +00:00
highdpi.pro	Extend high-DPI manual test	2015-07-30 18:10:03 +00:00
highdpi.qrc	Add support for "@3x" image loading.	2015-10-16 21:47:25 +00:00
main.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
qticon16.png	…
qticon16@2x.png	…
qticon16@3x.png	Add support for "@3x" image loading.	2015-10-16 21:47:25 +00:00
qticon32.png	…
qticon32@2x.png	…
qticon64.png	…