Edward Welbourne 23c9d4c98f Merge branch '5.11' into dev ... Conflicts: qmake/library/qmakebuiltins.cpp src/plugins/platforms/windows/qwindowstabletsupport.h src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/styles/qstylesheetstyle.cpp tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Done-With: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e		2018-07-31 13:33:14 +02:00
..
ioutils.cpp	qmake: minor fixups to ioutils for building in qt creator context	2018-03-29 18:15:35 +00:00
ioutils.h	qmake: minor fixups to ioutils for building in qt creator context	2018-03-29 18:15:35 +00:00
proitems.cpp	qmake: make yet more use of ProString::toQStringRef()	2017-08-26 12:11:35 +00:00
proitems.h	qmake: make access to raw data temporaries safe	2018-06-27 17:24:09 +00:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	Merge branch '5.11' into dev	2018-07-31 13:33:14 +02:00
qmakeevaluator_p.h	qmake: make argument validation of built-ins data driven	2018-06-27 17:23:57 +00:00
qmakeevaluator.cpp	qmake: make access to raw data temporaries safe	2018-06-27 17:24:09 +00:00
qmakeevaluator.h	Merge branch '5.11' into dev	2018-07-31 13:33:14 +02:00
qmakeglobals.cpp	qmake: skip empty parts when splitting strings in some more places	2018-06-01 09:09:35 +00:00
qmakeglobals.h	qmake: updates to the parsing code of external properties	2018-03-29 18:15:29 +00:00
qmakeparser.cpp	qmake: make VFS aware of exact vs. cumulative evaluation	2018-03-29 18:15:10 +00:00
qmakeparser.h	qmake: make VFS aware of exact vs. cumulative evaluation	2018-03-29 18:15:10 +00:00
qmakevfs.cpp	qmake: add text codec support to VFS	2018-03-29 18:15:16 +00:00
qmakevfs.h	qmake: add text codec support to VFS	2018-03-29 18:15:16 +00:00