Liang Qi afab1546a7 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: qmake/doc/snippets/code/doc_src_qmake-manual.pro qmake/doc/src/qmake-manual.qdoc src/corelib/io/qstorageinfo_unix.cpp src/corelib/tools/qbytearray.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp tests/auto/network/access/qnetworkreply/BLACKLIST Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c		2015-08-26 20:06:57 +02:00
..
assets	WinRT: Refactor icon specification usage	2015-01-13 11:29:42 +01:00
manifests	WinRT: Add Architecture flag to manifest	2015-08-06 07:43:09 +00:00
qmake.conf	Makes sure that yacc works with the MSYS bison on Windows.	2015-07-20 16:09:07 +00:00
qplatformdefs.h	winrt: Fix build when INADDR_XXX macros are not defined	2015-07-22 06:44:00 +00:00