summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2010-12-03 15:03:41 +1000
committerRhys Weatherley <rhys.weatherley@nokia.com>2010-12-03 15:03:41 +1000
commitf527dc068bced4685fc5b332f0970320f9aa3bfb (patch)
tree4243209f86b05d2cf92f07122f7d416c578ef4c9
parent35f627d73e39ee9d6de1568b435897801d3b850c (diff)
Export some QTestLib functions.
-rw-r--r--src/quicktestlib/testlib/qtestcase.cpp5
-rw-r--r--src/quicktestlib/testlib/qtestlog_p.h2
-rw-r--r--src/quicktestlib/testlib/qtestresult_p.h2
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 };