whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/testlib
History
Edward Welbourne f6fc34294f Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
 		2016-08-01 18:20:00 +02:00
..
3rdparty Fix more warnings, found by cross-compiling Qt 2013-05-01 08:48:13 +02:00
doc Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
Qt5TestConfigExtras.cmake.in Fix QFINDTESTDATA when using cmake ninja generator 2016-03-19 13:44:21 +00:00
qabstracttestlogger.cpp QtTest: Remove Windows CE. 2016-04-06 10:56:02 +00:00
qabstracttestlogger_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qasciikey.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qbenchmark.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qbenchmark.h Updated license headers 2016-01-15 12:25:24 +00:00
qbenchmark_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qbenchmarkevent.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qbenchmarkevent_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qbenchmarkmeasurement.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qbenchmarkmeasurement_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qbenchmarkmetric.cpp Enable support for ref-cycles perf counter in QtTestLib. 2016-03-03 09:55:22 +00:00
qbenchmarkmetric.h Enable support for ref-cycles perf counter in QtTestLib. 2016-03-03 09:55:22 +00:00
qbenchmarkmetric_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qbenchmarkperfevents.cpp Enable support for ref-cycles perf counter in QtTestLib. 2016-03-03 09:55:22 +00:00
qbenchmarkperfevents_p.h Updated license headers 2016-01-21 18:55:18 +00:00
qbenchmarkvalgrind.cpp QtTest: eradicate all Q_FOREACH loops 2016-02-29 07:57:51 +00:00
qbenchmarkvalgrind_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qcsvbenchmarklogger.cpp Update the Intel copyright year 2016-01-21 22:44:16 +00:00
qcsvbenchmarklogger_p.h Update the Intel copyright year 2016-01-21 22:44:16 +00:00
qplaintestlogger.cpp QtTest: Remove Windows CE. 2016-04-06 10:56:02 +00:00
qplaintestlogger_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qsignaldumper.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qsignaldumper_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qsignalspy.h Updated license headers 2016-01-15 12:25:24 +00:00
qsignalspy.qdoc Unify license header usage. 2016-03-29 10:20:03 +00:00
qteamcitylogger.cpp Add TeamCity logging feature to testlib 2016-01-23 18:30:58 +00:00
qteamcitylogger_p.h Add TeamCity logging feature to testlib 2016-01-23 18:30:58 +00:00
qtest.h Merge remote-tracking branch 'origin/5.7' into dev 2016-07-19 20:14:40 +02:00
qtest_global.h Updated license headers 2016-01-15 12:25:24 +00:00
qtest_gui.h Testlib: Format QRegion in QCOMPARE 2016-07-05 18:49:19 +00:00
qtest_widgets.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestaccessible.h QtTest: eradicate all Q_FOREACH loops 2016-02-29 07:57:51 +00:00
qtestassert.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestblacklist.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
qtestblacklist_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestcase.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
qtestcase.h Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
qtestcase.qdoc doc: add docs for QTest::createTouchDevice() 2016-06-15 11:27:00 +00:00
qtestcoreelement_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestcorelist_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestdata.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtestdata.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestelement.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtestelement_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestelementattribute.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtestelementattribute_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestevent.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestevent.qdoc Unify license header usage. 2016-03-29 10:20:03 +00:00
qtesteventloop.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestkeyboard.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qtestlog.cpp Add TeamCity logging feature to testlib 2016-01-23 18:30:58 +00:00
qtestlog_p.h Add TeamCity logging feature to testlib 2016-01-23 18:30:58 +00:00
qtestmouse.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtestmouse.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestresult.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtestresult_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtestspontaneevent.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
qtestsystem.h Updated license headers 2016-01-15 12:25:24 +00:00
qtesttable.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtesttable_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qtesttouch.h add QTest::createTouchDevice() 2016-06-10 13:08:00 +00:00
qtestxunitstreamer.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qtestxunitstreamer_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qxctestlogger.mm Add support for Apple tvOS 2016-05-17 16:11:23 +00:00
qxctestlogger_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qxmltestlogger.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qxmltestlogger_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qxunittestlogger.cpp Use local result metric instead of global result metric. 2016-03-03 09:56:08 +00:00
qxunittestlogger_p.h Updated license headers 2016-01-15 12:25:24 +00:00
testlib.pro Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00