qt5base-lts/mkspecs/features/data
Liang Qi 318b58562a Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
	.qmake.conf
	mkspecs/common/msvc-desktop.conf
	mkspecs/common/msvc-version.conf
	mkspecs/common/winrt_winphone/qmake.conf
	mkspecs/features/mac/default_post.prf
	mkspecs/features/mac/sdk.prf
	mkspecs/features/qt.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/winrt/default_pre.prf
	mkspecs/winphone-arm-msvc2013/qmake.conf
	mkspecs/winphone-x86-msvc2013/qmake.conf
	mkspecs/winrt-arm-msvc2013/qmake.conf
	mkspecs/winrt-x64-msvc2013/qmake.conf
	mkspecs/winrt-x86-msvc2013/qmake.conf
	qmake/generators/win32/msvc_vcproj.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/network/kernel/qhostaddress.cpp
	src/plugins/platforms/mirclient/qmirclientplugin.cpp
	src/plugins/platforms/mirclient/qmirclientplugin.h
	src/widgets/util/qsystemtrayicon.cpp
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
	tools/configure/Makefile.mingw
	tools/configure/Makefile.win32

Done-with: Jake Petroules <jake.petroules@qt.io>
Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe
2017-01-25 20:06:06 +01:00
..
android Android Windows: Adjust to new SDK layout 2013-07-04 21:39:24 +02:00
cmake CMake: Create a Qt5::<ModuleName>Private target for each module 2016-12-23 19:24:35 +00:00
mac Add tool to namespace Objective-C classes at link time 2016-01-29 14:41:21 +00:00
unix findclasslist.pl: namespaces can be exported too 2016-10-13 08:29:02 +00:00
configure.json inline "committing" of configure command line built-ins 2017-01-19 21:47:38 +00:00
dummy.cpp Implement a more direct headersclean check 2015-04-17 00:54:45 +00:00
macros.cpp determine compiler version at build time, not in configure 2016-12-23 13:44:50 +00:00