Lars Knoll db92f2f3aa Merge remote-tracking branch 'origin/5.9' into 5.10 ... 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		2017-12-30 12:09:53 +01:00
..
bitcode.prf	Compare versions in qmake files with versionAtLeast	2017-08-02 21:08:07 +00:00
default_post.prf	Compare versions in qmake files with versionAtLeast	2017-08-02 21:08:07 +00:00
default_pre.prf	Compare versions in qmake files with versionAtLeast	2017-08-02 21:08:07 +00:00
device_destinations.sh	qmake: properly filter simulator devices by minimum deployment target	2017-11-15 02:08:54 +00:00
devices.py	qmake: properly filter simulator devices by minimum deployment target	2017-11-15 02:08:54 +00:00
exclusive_builds_post.prf
qt_parts.prf
qt.prf
resolve_config.prf
sdk.prf
testcase_targets.prf
testcase.prf
watchos_coretext.prf	Fix CoreText font database build on watchOS	2017-03-30 22:54:31 +00:00
xcodebuild.mk	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-12-30 12:09:53 +01:00
xcodebuild.prf	qmake: properly filter simulator devices by minimum deployment target	2017-11-15 02:08:54 +00:00