AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove duplicate symbol name: QTest::currentAppName

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2014-02-28 21:36:13 -08:00 committed by The Qt Project
parent 03fc60debf
commit 090124eab6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/testlib/qtestresult.cpp
View File

@ -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