diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
| commit | 71478352376022faa9be6d79f2a760c289945ff5 (patch) | |
| tree | 0f8ff4a88c1b033367337a93d23a329d145ee903 /src/qmltest | |
| parent | c38efcb67cf93ba3e91e184c3b891efef4ef75a3 (diff) | |
| parent | 05daa9bfe1a03ffe1cc580b6cfd88e093e2493c0 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/declarative/declarative.pro
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgshadereffectsource_p.h
src/declarative/items/qsgview.cpp
src/declarative/particles/qsgcustomparticle.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
src/qtquick1/qtquick1.pro
tests/auto/declarative/examples/examples.pro
tests/auto/declarative/qsglistview/qsglistview.pro
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/qmltest.pro | 2 | ||||
| -rw-r--r-- | src/qmltest/quicktest.cpp | 9 | ||||
| -rw-r--r-- | src/qmltest/quicktestresult.cpp | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index 418136aa0a..b19ad55092 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -4,7 +4,7 @@ TARGET = QtQuickTest QPRO_PWD = $$PWD CONFIG += module -CONFIG += dll warn_on +CONFIG += dll warn_on declarative_debug MODULE_PRI += ../../modules/qt_qmltest.pri QT += testlib-private declarative testlib qtquick1 diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index 7f16eddc7e..c7d9747a3e 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -67,15 +67,6 @@ QT_BEGIN_NAMESPACE -// Copied from qdeclarativedebughelper_p.h in Qt, to avoid a dependency -// on a private header from Qt. -class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper -{ -public: - static QJSEngine *getScriptEngine(QDeclarativeEngine *engine); - static void setAnimationSlowDownFactor(qreal factor); - static void enableDebugging(); -}; class QTestRootObject : public QObject { diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index 534c57e1c2..80c3f8b3d5 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -442,14 +442,14 @@ bool QuickTestResult::compare void QuickTestResult::skipSingle (const QString &message, const QString &file, int line) { - QTestResult::addSkip(message.toLatin1().constData(), QTest::SkipSingle, + QTestResult::addSkip(message.toLatin1().constData(), qtest_fixFile(file).toLatin1().constData(), line); } void QuickTestResult::skipAll (const QString &message, const QString &file, int line) { - QTestResult::addSkip(message.toLatin1().constData(), QTest::SkipAll, + QTestResult::addSkip(message.toLatin1().constData(), qtest_fixFile(file).toLatin1().constData(), line); QTestResult::setSkipCurrentTest(true); } |