Liang Qi 511790fd1a Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: config_help.txt configure mkspecs/features/uikit/sdk.prf src/corelib/global/qhooks.cpp src/corelib/io/qfilesystemwatcher.cpp src/corelib/io/qlockfile_unix.cpp src/corelib/tools/qalgorithms.h src/gui/kernel/qwindowsysteminterface.h src/gui/text/qtextdocument_p.cpp src/network/access/access.pri src/network/access/qnetworkaccessmanager.cpp src/network/access/qnetworkreplynsurlconnectionimpl.mm src/src.pro src/testlib/qtestcase.cpp src/widgets/kernel/qwidgetbackingstore_p.h src/widgets/styles/qwindowscestyle.cpp src/widgets/styles/qwindowsmobilestyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp tools/configure/configureapp.cpp Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67		2016-06-13 12:46:46 +02:00
..
icons	QIconLoader: Use the GTK+ icon caches	2015-09-13 16:23:24 +00:00
second_icons/testtheme/32x32/actions	Fixed icons lookup in QIcon::fromTheme	2015-02-02 23:28:19 +00:00
styles/commonstyle/images	tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile()	2013-07-15 16:28:25 +02:00
.gitignore
image.png
qicon.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
rect.png
tst_qicon.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
tst_qicon.qrc	QIconLoader: Use the GTK+ icon caches	2015-09-13 16:23:24 +00:00