AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
82ea53ad24
qt5base-lts/tests/auto
History
Edward Welbourne 82ea53ad24 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	qmake/library/qmakeevaluator.cpp

One side changed the iterator to use ranged-for, the other changed its
body; they only conflicted because the latter had to add braces around
the body, intruding on the for-line.  Trivial resolution.

Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b
2016-07-15 20:47:57 +02:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data
cmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
compilerwarnings/data Updated license headers 2016-01-21 18:55:18 +00:00
concurrent QtConcurrentRun: add unittest for polling for isFinished() 2016-02-15 13:53:57 +00:00
corelib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
dbus Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
gui xcb: Send expose event while shrinking windows 2016-06-30 06:51:48 +00:00
guiapplauncher
installed_cmake
network QSslSocket: reset connection parameters on disconnect 2016-07-05 19:21:06 +00:00
opengl Merge remote-tracking branch 'origin/5.6.1' into 5.6 2016-06-02 06:01:25 +02:00
other Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
printsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-29 12:34:31 +01:00
shared Updated license headers 2016-01-21 18:55:18 +00:00
sql Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
testlib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
xml Updated license headers 2016-01-21 18:55:18 +00:00
auto.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
network-settings.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qtest-config.h Updated license headers 2016-01-21 18:55:18 +00:00
test.pl Updated license headers 2016-01-21 18:55:18 +00:00