From f527dc068bced4685fc5b332f0970320f9aa3bfb Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Fri, 3 Dec 2010 15:03:41 +1000 Subject: Export some QTestLib functions. --- src/quicktestlib/testlib/qtestcase.cpp | 5 +++-- src/quicktestlib/testlib/qtestlog_p.h | 2 +- src/quicktestlib/testlib/qtestresult_p.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/quicktestlib/testlib/qtestcase.cpp b/src/quicktestlib/testlib/qtestcase.cpp index 73f4eb4..33fbca3 100644 --- a/src/quicktestlib/testlib/qtestcase.cpp +++ b/src/quicktestlib/testlib/qtestcase.cpp @@ -972,7 +972,8 @@ static int qToInt(char *str) return l; } -static void qParseArgs(int argc, char *argv[]) +Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[]); +void qtest_qParseArgs(int argc, char *argv[]) { lastTestFuncIdx = -1; @@ -1691,7 +1692,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) QTEST_ASSERT(metaObject); QTestResult::setCurrentTestObject(metaObject->className()); - qParseArgs(argc, argv); + qtest_qParseArgs(argc, argv); #ifdef QTESTLIB_USE_VALGRIND if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) { const QStringList origAppArgs(QCoreApplication::arguments()); diff --git a/src/quicktestlib/testlib/qtestlog_p.h b/src/quicktestlib/testlib/qtestlog_p.h index ad1f45c..2e5f85e 100644 --- a/src/quicktestlib/testlib/qtestlog_p.h +++ b/src/quicktestlib/testlib/qtestlog_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE class QBenchmarkResult; -class QTestLog +class Q_TESTLIB_EXPORT QTestLog { public: enum LogMode { Plain = 0, XML, LightXML, XunitXML }; diff --git a/src/quicktestlib/testlib/qtestresult_p.h b/src/quicktestlib/testlib/qtestresult_p.h index f99fe8d..440d870 100644 --- a/src/quicktestlib/testlib/qtestresult_p.h +++ b/src/quicktestlib/testlib/qtestresult_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE class QTestResultPrivate; class QTestData; -class QTestResult +class Q_TESTLIB_EXPORT QTestResult { public: enum TestLocation { NoWhere = 0, DataFunc = 1, InitFunc = 2, Func = 3, CleanupFunc = 4 }; -- cgit v1.2.3