0f315adf91
Conflicts: .qmake.conf sc/corelib/io/qfsfileengine_p.h src/corelib/io/qstorageinfo_unix.cpp src/platformsupport/eglconvenience/qeglpbuffer_p.h src/platformsupport/input/libinput/qlibinputkeyboard.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/ios/qiosscreen.h src/plugins/platforms/ios/qioswindow.h src/plugins/platforms/ios/quiview.mm src/printsupport/dialogs/qpagesetupdialog_unix_p.h src/printsupport/dialogs/qprintpreviewdialog.cpp src/printsupport/widgets/qcupsjobwidget_p.h src/widgets/widgets/qmenu.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c |
||
---|---|---|
.. | ||
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++.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 | ||
ios.conf | ||
linux.conf | ||
llvm.conf | ||
mac.conf | ||
macx.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-vulkan.conf |