aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest/quicktestresult_p.h
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-02-07 12:42:05 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-09 06:29:37 +0100
commit3233e8052d2d25fd36567f67f9cd314cf0eaef92 (patch)
tree9457848b778ead5e9ba5696153f854b7e3642307 /src/qmltest/quicktestresult_p.h
parent5b76b0de4848912cb9901524ff07d03bc9b71a5f (diff)
Remove code related to test location.
Testlib no longer does anything with the test location and neither do any of Qt's tests, so this code is no longer needed. Change-Id: Ic370b6b741382a90454c893bffcab4a7328a2f9e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/qmltest/quicktestresult_p.h')
-rw-r--r--src/qmltest/quicktestresult_p.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h
index 2c37faba7e..f6f0c3a1b3 100644
--- a/src/qmltest/quicktestresult_p.h
+++ b/src/qmltest/quicktestresult_p.h
@@ -56,10 +56,9 @@ class QuickTestResultPrivate;
class Q_QUICK_TEST_EXPORT QuickTestResult : public QObject
{
Q_OBJECT
- Q_ENUMS(FunctionType RunMode)
+ Q_ENUMS(RunMode)
Q_PROPERTY(QString testCaseName READ testCaseName WRITE setTestCaseName NOTIFY testCaseNameChanged)
Q_PROPERTY(QString functionName READ functionName WRITE setFunctionName NOTIFY functionNameChanged)
- Q_PROPERTY(FunctionType functionType READ functionType WRITE setFunctionType NOTIFY functionTypeChanged)
Q_PROPERTY(QString dataTag READ dataTag WRITE setDataTag NOTIFY dataTagChanged)
Q_PROPERTY(bool failed READ isFailed)
Q_PROPERTY(bool dataFailed READ isDataFailed)
@@ -72,16 +71,6 @@ public:
QuickTestResult(QObject *parent = 0);
~QuickTestResult();
- // Values must match QTestResult::TestLocation.
- enum FunctionType
- {
- NoWhere = 0,
- DataFunc = 1,
- InitFunc = 2,
- Func = 3,
- CleanupFunc = 4
- };
-
// Values must match QBenchmarkIterationController::RunMode.
enum RunMode
{
@@ -95,9 +84,6 @@ public:
QString functionName() const;
void setFunctionName(const QString &name);
- FunctionType functionType() const;
- void setFunctionType(FunctionType type);
-
QString dataTag() const;
void setDataTag(const QString &tag);
@@ -164,7 +150,6 @@ Q_SIGNALS:
void programNameChanged();
void testCaseNameChanged();
void functionNameChanged();
- void functionTypeChanged();
void dataTagChanged();
void skippedChanged();