qt6-bb10/tests/auto/corelib/tools/qstring
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
..
.gitignore Moving relevant tests to corelib/tools 2011-09-01 13:07:23 +02:00
double_data.h Updated license headers 2016-01-21 18:55:18 +00:00
qstring.pro Replace qdtoa and qstrtod implementation by a 3rdparty library 2015-11-02 17:00:50 +00:00
tst_qstring.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
tst_qstring_mac.mm Updated license headers 2016-01-21 18:55:18 +00:00