diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-02 13:12:51 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-02 13:12:51 (GMT) |
| commit | eeaf1b14b45714cf2d7e447806f0893367dc4f6a (patch) | |
| tree | 69d37edb0067bf60e2279ffe70cc88921a173c42 /tests | |
| parent | 11d2c8f96697adc93ccd82e3db1de6ecde025eff (diff) | |
| parent | 57d33781bd8e02904a85de7fc54f8f4e8bd299e6 (diff) | |
| download | Qt-eeaf1b14b45714cf2d7e447806f0893367dc4f6a.zip Qt-eeaf1b14b45714cf2d7e447806f0893367dc4f6a.tar.gz Qt-eeaf1b14b45714cf2d7e447806f0893367dc4f6a.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/maketestselftest/tst_maketestselftest.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp index c674202..ef92c56 100644 --- a/tests/auto/maketestselftest/tst_maketestselftest.cpp +++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp @@ -92,6 +92,9 @@ void tst_MakeTestSelfTest::auto_dot_pro_data() QStringList subdirs = dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot); foreach (const QString& subdir, subdirs) { + if (subdir == QString::fromLatin1("tmp")) { + continue; + } QTest::newRow(qPrintable(subdir)) << subdir; } } diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 2aeabf0..ef960d0 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -2907,7 +2907,7 @@ void tst_QScriptValue::equals() QScriptValue qobj1 = eng.newQObject(this); QScriptValue qobj2 = eng.newQObject(this); QScriptValue qobj3 = eng.newQObject(0); - QScriptValue qobj4 = eng.newQObject(new QObject()); + QScriptValue qobj4 = eng.newQObject(new QObject(), QScriptEngine::ScriptOwnership); QVERIFY(qobj1.equals(qobj2)); // compares the QObject pointers QVERIFY(!qobj2.equals(qobj4)); // compares the QObject pointers QVERIFY(!qobj2.equals(obj2)); // compares the QObject pointers |