diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 13:03:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 13:03:09 +0100 |
| commit | f94ca82e0ff6345648b499911411f2dcc1849267 (patch) | |
| tree | bc5acac8bfecaf5bccc612f5b009bf249bc69ef1 /src/testlib | |
| parent | fe29a6a6ebbf28505df7cdf1de24fa540fd3745e (diff) | |
| parent | b1092a7d4240d419cc2b5f3f5c326a1cb680bbdd (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ibfcb30053f3aacb8ec2ec480e146538c9bf440ea
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.qdoc | 2 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc index ad9776f7ec..31903ea29c 100644 --- a/src/testlib/qtestcase.qdoc +++ b/src/testlib/qtestcase.qdoc @@ -959,7 +959,7 @@ \overload \since 5.8 - Returns a string containing \c{nullptr}. + Returns a string containing \nullptr. */ /*! diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 46b61dac07..34bb581e02 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -12,6 +12,7 @@ unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ QMAKE_DOCS = $$PWD/doc/qttestlib.qdocconf HEADERS = \ + qabstracttestlogger_p.h \ qbenchmark.h \ qbenchmark_p.h \ qbenchmarkmeasurement_p.h \ @@ -21,10 +22,16 @@ HEADERS = \ qbenchmarkperfevents_p.h \ qbenchmarkmetric.h \ qbenchmarkmetric_p.h \ + qcsvbenchmarklogger_p.h \ + qplaintestlogger_p.h \ + qsignaldumper_p.h \ qsignalspy.h \ + qteamcitylogger_p.h \ qtestaccessible.h \ qtestassert.h \ qtestcase.h \ + qtestcoreelement_p.h \ + qtestcorelist_p.h \ qtestdata.h \ qtestevent.h \ qtesteventloop.h \ @@ -32,15 +39,23 @@ HEADERS = \ qtest_network.h \ qtest_widgets.h \ qtest.h \ + qtestelement_p.h \ + qtestelementattribute_p.h \ qtestkeyboard.h \ + qtestlog_p.h \ qtestmouse.h \ + qtestresult_p.h \ qtestspontaneevent.h \ qtestsystem.h \ + qtesttable_p.h \ qtesttouch.h \ qtestblacklist_p.h \ qtesthelpers_p.h \ qttestglobal.h \ - qtaptestlogger_p.h + qtestxunitstreamer_p.h \ + qtaptestlogger_p.h \ + qxmltestlogger_p.h \ + qxunittestlogger_p.h SOURCES = \ qtestcase.cpp \ |