Edward Welbourne 23c9d4c98f Merge branch '5.11' into dev ... Conflicts: qmake/library/qmakebuiltins.cpp src/plugins/platforms/windows/qwindowstabletsupport.h src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/styles/qstylesheetstyle.cpp tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Done-With: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e		2018-07-31 13:33:14 +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 branch '5.11' into dev	2018-07-31 13:33:14 +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 branch '5.11' into dev	2018-07-31 13:33:14 +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	qmake: Write correct Xcode project directory name to xcscheme file	2018-07-20 06:40:12 +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