Qt Forward Merge Bot 1783fca897 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbintegration.cpp Conflicts git missed: src/plugins/platforms/qnx/qqnxglcontext.cpp Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc		2018-07-17 10:19:22 +02:00
..
doc	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-02 11:23:45 +02:00
generators	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-17 10:19:22 +02:00
library	qmake: make access to raw data temporaries safe	2018-06-27 17:24:09 +00:00
cachekeys.h
main.cpp	Win: Handle installation of read-only target files correctly	2017-09-13 12:45:35 +00:00
Makefile.unix	Add qbswap for a memory region	2018-07-04 03:04:40 +00:00
Makefile.unix.macos
Makefile.unix.mingw	fix "make clean" of qmake in a builddir with spaces on mingw	2017-12-14 18:06:31 +00:00
Makefile.unix.unix	Move the readlink(2) wrapper to qcore_unix.cpp	2017-07-08 02:18:16 +00:00
Makefile.unix.win32	QFileSystemEngine: Remove the remainder of Windows XP functions	2017-07-25 01:01:02 +00:00
Makefile.win32	Add qbswap for a memory region	2018-07-04 03:04:40 +00:00
meta.cpp	qmake: refactor QMakeMetaInfo::findLib() interface	2018-07-16 15:44:23 +00:00
meta.h	qmake: refactor QMakeMetaInfo::findLib() interface	2018-07-16 15:44:23 +00:00
option.cpp	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
option.h
project.cpp	qmake: make argument validation of built-ins data driven	2018-06-27 17:23:57 +00:00
project.h
property.cpp
property.h
qmake_pch.h
qmake-aux.pro	revert to building qmake with qconfig.cpp	2017-01-06 20:09:08 +00:00
qmake.pri	QFileSystemEngine: Remove the remainder of Windows XP functions	2017-07-25 01:01:02 +00:00
qmake.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00