use auto-defined QT_BUILD_*_LIB variables

[profile/ivi/qtdeclarative.git] / src / qmltest / quicktestresult_p.h

diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h
index 2c37fab..76761b6 100644 (file)
--- a/src/qmltest/quicktestresult_p.h
+++ b/src/qmltest/quicktestresult_p.h
@@ -47,6 +47,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qscopedpointer.h>
+#include <QtQuick/qquickitem.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,13 +57,11 @@ 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)
     Q_PROPERTY(bool skipped READ isSkipped WRITE setSkipped NOTIFY skippedChanged)
     Q_PROPERTY(int passCount READ passCount)
     Q_PROPERTY(int failCount READ failCount)
@@ -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,14 +84,10 @@ public:
     QString functionName() const;
     void setFunctionName(const QString &name);
 
-    FunctionType functionType() const;
-    void setFunctionType(FunctionType type);
-
     QString dataTag() const;
     void setDataTag(const QString &tag);
 
     bool isFailed() const;
-    bool isDataFailed() const;
 
     bool isSkipped() const;
     void setSkipped(bool skip);
@@ -123,6 +108,7 @@ public Q_SLOTS:
     void clearTestTable();
 
     void finishTestData();
+    void finishTestDataCleanup();
     void finishTestFunction();
 
     void fail(const QString &message, const QUrl &location, int line);
@@ -154,17 +140,19 @@ public Q_SLOTS:
     void nextBenchmark();
     void stopBenchmark();
 
+    QObject *grabImage(QQuickItem *item);
+
 public:
     // Helper functions for the C++ main() shell.
     static void parseArgs(int argc, char *argv[]);
     static void setProgramName(const char *name);
+    static void setCurrentAppname(const char *appname);
     static int exitCode();
 
 Q_SIGNALS:
     void programNameChanged();
     void testCaseNameChanged();
     void functionNameChanged();
-    void functionTypeChanged();
     void dataTagChanged();
     void skippedChanged();