db92f2f3aa
Conflicts: .qmake.conf mkspecs/win32-g++/qmake.conf src/corelib/global/qglobal_p.h src/corelib/global/qoperatingsystemversion_p.h src/corelib/io/qfilesystemengine_win.cpp src/network/bearer/qbearerengine.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/widgets/kernel/qwidget_p.h src/widgets/kernel/qwidgetwindow.cpp src/widgets/styles/qfusionstyle.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8 |
||
---|---|---|
.. | ||
bitcode.prf | ||
default_post.prf | ||
default_pre.prf | ||
device_destinations.sh | ||
devices.py | ||
exclusive_builds_post.prf | ||
qt_parts.prf | ||
qt.prf | ||
resolve_config.prf | ||
sdk.prf | ||
testcase_targets.prf | ||
testcase.prf | ||
watchos_coretext.prf | ||
xcodebuild.mk | ||
xcodebuild.prf |