diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:31:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-27 11:31:32 +0200 |
| commit | 150b8ca29417de2cd423ff92478eaf4cb2906601 (patch) | |
| tree | aa1c43ee9d096a4464636bcb5f294a11846572f4 /src/testlib/qtestresult.cpp | |
| parent | bd78389fc4fe0a4367696ba2fdcc6e8d09863698 (diff) | |
| parent | 16a36239ab9e9be45a940aeff94f35e29bdeb944 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/testlib/qtestresult.cpp')
| -rw-r--r-- | src/testlib/qtestresult.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index 7ab317f209..d94b2bf85c 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -63,7 +63,7 @@ namespace QTest static const char *expectFailComment = 0; static int expectFailMode = 0; - static const char *currentAppname = 0; + static const char *currentAppName = 0; } void QTestResult::reset() @@ -318,14 +318,14 @@ bool QTestResult::skipCurrentTest() return QTest::skipCurrentTest; } -void QTestResult::setCurrentAppname(const char *appname) +void QTestResult::setCurrentAppName(const char *appName) { - QTest::currentAppname = appname; + QTest::currentAppName = appName; } -const char *QTestResult::currentAppname() +const char *QTestResult::currentAppName() { - return QTest::currentAppname; + return QTest::currentAppName; } QT_END_NAMESPACE |