Oswald Buddenhagen ccf461acf0 fix logical mismerge from 5.6 ... iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7. Task-number: QTBUG-54163 Change-Id: If4a76f45450edc0f6e8fb3615355613212314300 Reviewed-by: Jake Petroules <jake.petroules@qt.io>		2016-06-17 09:45:23 +00:00
bin	Merge remote-tracking branch 'origin/5.6.0' into 5.7	2016-03-07 17:08:56 +01:00
config.tests	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-10 23:27:10 +02:00
dist	Add Qt 5.7.0 changelog	2016-06-10 06:48:56 +00:00
doc	Doc: Highlight Quick Controls 2 - Gallery example	2016-05-09 09:13:40 +00:00
examples	examples/corelib/mimetypebrowser: Fix no-widgets build	2016-06-07 17:55:28 +00:00
lib
mkspecs	fix logical mismerge from 5.6	2016-06-17 09:45:23 +00:00
qmake	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
src	Merge "Merge remote-tracking branch 'origin/5.7.0' into 5.7" into refs/staging/5.7	2016-06-16 12:25:24 +00:00
tests	Merge remote-tracking branch 'origin/5.7.0' into 5.7	2016-06-16 07:30:02 +02:00
tools	Merge remote-tracking branch 'origin/5.7.0' into 5.7	2016-06-16 07:30:02 +02:00
util	Re-generate QLocale data from CLDR v29	2016-04-08 03:51:18 +00:00
.gitattributes
.gitignore	normalize structure of plugandpaint example	2016-05-03 10:25:18 +00:00
.qmake.conf	Bump version	2016-05-23 18:28:33 +00:00
.tag
configure	Merge remote-tracking branch 'origin/5.7.0' into 5.7	2016-06-16 07:30:02 +02:00
configure.bat	Add initial clang-cl support to Qt	2016-02-11 12:54:06 +00:00
header.BSD
header.BSD-OLD
header.COMM
header.FDL
header.FDL-OLD
header.GPL
header.GPL-EXCEPT
header.LGPL
header.LGPL3
header.LGPL3-COMM
header.LGPL21
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	Bump copyright year to 2016	2016-01-29 13:30:04 +00:00
LICENSE.LGPLv21	Bump copyright year to 2016	2016-01-29 13:30:04 +00:00
LICENSE.PREVIEW.COMMERCIAL
qtbase.pro	mkspec: Correctly cleanup qhost.pri file.	2016-03-22 09:45:10 +00:00
sync.profile