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
..
mac	Stop blocking the ability to generate dSYM debug symbols with Xcode	2017-12-14 09:39:16 +00:00
unix	make mkspecs not mess up -rpath-link	2017-05-31 12:57:14 +00:00
win32	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-10-16 22:21:52 +03:00
makefile.cpp	Move a QRegExp out of a deeply nested loop	2017-11-23 05:27:33 +00:00
makefile.h	don't pass qmake configure arguments to sub-projects	2017-01-06 20:09:18 +00:00
makefiledeps.cpp	Adapt qmake's raw-string parser to avoid confusion by macros	2017-08-24 14:27:50 +00:00
makefiledeps.h	qmake: replace a uint:1 with a bool	2016-08-15 22:16:09 +00:00
metamakefile.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
metamakefile.h	…
projectgenerator.cpp	Pass the absolute path with the file when finding files	2017-06-19 08:39:40 +00:00
projectgenerator.h	…
xmloutput.cpp	…
xmloutput.h	…