Liang Qi 093290a662 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/platforms/ios/quiview.mm Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412		2018-04-11 09:34:23 +02:00
bin	syncqt: remove 'descend' parameter from findFiles()	2018-02-28 18:15:56 +00:00
config.tests	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
dist	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
doc	Doc: Update Find Files example	2018-04-09 06:50:52 +00:00
examples	textedit example: Fix disabled Cut/Copy menu items	2018-04-10 16:27:14 +00:00
lib
mkspecs	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-11 09:34:23 +02:00
qmake	Set WindowsTargetPlatform[Min]Version if WindowsSDKVersion is set	2018-04-06 06:18:00 +00:00
src	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-11 09:34:23 +02:00
tests	Merge remote-tracking branch 'origin/5.11' into dev	2018-04-11 09:34:23 +02:00
util	Add a note to the CLDR-munging scripts about updating the attribution	2018-02-17 22:22:33 +00:00
.gitattributes
.gitignore
.qmake.conf	Bump version	2018-02-20 19:53:08 +01:00
.tag
config_help.txt	xcb: Use XCB instead of Xlib for XInput	2018-03-22 20:51:09 +00:00
configure	configure: Detect Cocoa instead of Carbon	2018-04-05 21:04:22 +00:00
configure.bat
configure.json	Merge remote-tracking branch 'origin/5.11' into dev	2018-03-28 08:12:21 +02:00
configure.pri	Configure: Restore default prefix on Windows	2018-04-09 15:32:19 +00:00
header.BSD
header.COMM
header.FDL
header.GPL
header.GPL-EXCEPT
header.LGPL
header.LGPL3
header.LGPL3-COMM
header.LGPL-NOGPL2
header.LGPL-ONLY
INSTALL
LGPL_EXCEPTION.txt
LICENSE.FDL
LICENSE.GPL2
LICENSE.GPL3
LICENSE.GPL3-EXCEPT
LICENSE.GPLv3
LICENSE.LGPL3
LICENSE.LGPLv3
LICENSE.LGPLv21
LICENSE.PREVIEW.COMMERCIAL
qtbase.pro
sync.profile	Testlib: Rename qtest_global.h to qttestglobal.h	2018-03-21 10:31:01 +00:00