fbfacd33be
Conflicts: src/android/templates/AndroidManifest.xml src/network/ssl/qsslsocket_mac.cpp src/widgets/styles/qstylesheetstyle.cpp tests/auto/corelib/kernel/qtimer/BLACKLIST tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp tests/auto/testlib/selftests/expected_blacklisted.lightxml tests/auto/testlib/selftests/expected_blacklisted.tap tests/auto/testlib/selftests/expected_blacklisted.teamcity tests/auto/testlib/selftests/expected_blacklisted.txt tests/auto/testlib/selftests/expected_blacklisted.xml tests/auto/testlib/selftests/expected_blacklisted.xunitxml tests/auto/testlib/selftests/expected_float.tap tests/auto/testlib/selftests/expected_float.teamcity tests/auto/testlib/selftests/expected_float.txt tests/auto/testlib/selftests/expected_float.xunitxml Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de> Done-With: Edward Welbourne <edward.welbourne@qt.io> Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: If93cc432a56ae3ac1b6533d0028e4dc497415a52 |
||
---|---|---|
.. | ||
aix | ||
android | ||
bsd | ||
c89 | ||
integrity | ||
mac | ||
nacl | ||
posix | ||
qnx | ||
uikit | ||
winrt_winphone | ||
android-base-head.conf | ||
android-base-tail.conf | ||
angle.conf | ||
clang-mac.conf | ||
clang.conf | ||
g++-base.conf | ||
g++-macx.conf | ||
g++-unix.conf | ||
g++-win32.conf | ||
g++.conf | ||
gcc-base-mac.conf | ||
gcc-base-unix.conf | ||
gcc-base.conf | ||
ghs-base.conf | ||
ghs-integrity-armv7.conf | ||
ghs-integrity-armv8.conf | ||
ghs-integrity-x86.conf | ||
icc-base-unix.conf | ||
ios.conf | ||
linux.conf | ||
llvm.conf | ||
mac.conf | ||
macx.conf | ||
msvc-based-version.conf | ||
msvc-desktop.conf | ||
msvc-version.conf | ||
qcc-base-qnx-aarch64le.conf | ||
qcc-base-qnx-armle-v7.conf | ||
qcc-base-qnx-x86-64.conf | ||
qcc-base-qnx-x86.conf | ||
qcc-base-qnx.conf | ||
qcc-base.conf | ||
sanitize.conf | ||
shell-unix.conf | ||
shell-win32.conf | ||
solaris.conf | ||
tvos.conf | ||
uikit.conf | ||
unix.conf | ||
watchos.conf | ||
windows-desktop.conf | ||
windows-vulkan.conf |