Liang Qi e3ed2281c0 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_dragging.mm src/plugins/platforms/ios/qiosinputcontext.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/tools/androiddeployqt/main.cpp Was moved from qttools into qtbase in 5.11. So re-apply 32398e4d here. tests/auto/corelib/global/qlogging/test/test.pro tests/auto/corelib/global/qlogging/tst_qlogging.cpp tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp tests/auto/corelib/thread/qthreadstorage/test/test.pro tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qapplication/test/test.pro Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Done-with: Mårten Nordheim <marten.nordheim@qt.io> Done-with: Oliver Wolff <oliver.wolff@qt.io> Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b		2018-07-02 11:23:45 +02:00
..
aix-g++
aix-g++-64
android-clang	Use optimize_size instead of duplicating similar logic	2018-04-14 17:23:25 +00:00
android-g++	Use optimize_size instead of duplicating similar logic	2018-04-14 17:23:25 +00:00
common	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
cygwin-g++
darwin-g++	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
devices	Add WFD_DEVICE_CLIENT_TYPE attribute for INTEGRITY S820Am ADP	2018-03-05 11:37:38 +00:00
dummy
features	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
freebsd-clang
freebsd-g++
haiku-g++	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
hpuxi-g++-64	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
hurd-g++	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
integrity-armv7
integrity-armv7-imx6
integrity-armv8-rcar	Fix license headers	2018-01-09 07:47:20 +00:00
integrity-x86
linux-aarch64-gnu-g++
linux-arm-gnueabi-g++
linux-clang	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
linux-clang-libc++
linux-g++	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
linux-g++-32
linux-g++-64
linux-icc	centralize ICC flags for *nix-systems toolchains	2018-06-22 17:04:06 +00:00
linux-icc-32
linux-icc-64
linux-icc-k1om
linux-llvm	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
linux-lsb-g++	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
lynxos-g++	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
macx-clang	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-10 01:00:26 +02:00
macx-g++	macOS: Bump deployment target to 10.11	2018-02-11 17:02:31 +00:00
macx-icc	centralize ICC flags for *nix-systems toolchains	2018-06-22 17:04:06 +00:00
macx-ios-clang	Rewrite the Info.plist variable replacement handling	2018-01-06 19:46:00 +00:00
macx-tvos-clang	Rewrite the Info.plist variable replacement handling	2018-01-06 19:46:00 +00:00
macx-watchos-clang	Rewrite the Info.plist variable replacement handling	2018-01-06 19:46:00 +00:00
macx-xcode	Opt out of new Xcode build system until we can handle its requirements	2018-06-05 20:16:34 +00:00
modules
netbsd-g++
openbsd-g++
qnx-aarch64le-qcc
qnx-armle-v7-qcc
qnx-x86-64-qcc
qnx-x86-qcc
solaris-cc	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
solaris-cc-64	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
solaris-cc-64-stlport
solaris-cc-stlport
solaris-g++	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
solaris-g++-64	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
unsupported	Stop including net/if.h from qplatformdefs.h	2017-10-08 06:41:24 +00:00
win32-clang-g++	mkspecs: Factorize common parts of win32-g++ and win32-clang-g++	2018-02-21 18:08:01 +00:00
win32-clang-msvc	unify windows mkspecs: define c++ flags explicitly	2018-02-22 18:45:15 +00:00
win32-g++	unify windows mkspecs: define c++ flags explicitly	2018-02-22 18:45:15 +00:00
win32-icc	unify windows mkspecs: define c++ flags explicitly	2018-02-22 18:45:15 +00:00
win32-icc-k1om
win32-msvc	unify windows mkspecs: define c++ flags explicitly	2018-02-22 18:45:15 +00:00
winrt-arm-msvc2015
winrt-arm-msvc2017
winrt-x64-msvc2015
winrt-x64-msvc2017
winrt-x86-msvc2015
winrt-x86-msvc2017