diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-02-28 21:36:13 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-30 01:40:39 +0200 |
| commit | 090124eab6f184abbe9be04f4bc1a9eee5285207 (patch) | |
| tree | 52ebcba174f858f2a825a1e0117f1fa0340ef85d /src/testlib/qtestresult.cpp | |
| parent | 03fc60debf6baaec95ecfbde0b5910e30274402b (diff) | |
Remove duplicate symbol name: QTest::currentAppName
It's declared in qtestcase.h as a function, so let's not declare the one
in qtestresult.cpp as a static variable. None of the variables in
qtestresult.cpp need to be in the QTest namespace, but we don't need to
change them now.
Change-Id: If6cc34642fdfe3ccda3b8cea7d053ead0db9ccbd
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/testlib/qtestresult.cpp')
| -rw-r--r-- | src/testlib/qtestresult.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index a9abca0ef8..859f6743cd 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -51,6 +51,8 @@ #include <string.h> #include <wchar.h> +static const char *currentAppName = 0; + QT_BEGIN_NAMESPACE namespace QTest @@ -64,8 +66,6 @@ namespace QTest static const char *expectFailComment = 0; static int expectFailMode = 0; - - static const char *currentAppName = 0; } void QTestResult::reset() @@ -322,12 +322,12 @@ bool QTestResult::skipCurrentTest() void QTestResult::setCurrentAppName(const char *appName) { - QTest::currentAppName = appName; + ::currentAppName = appName; } const char *QTestResult::currentAppName() { - return QTest::currentAppName; + return ::currentAppName; } QT_END_NAMESPACE |