aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-01-27 16:00:54 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-29 10:08:46 +0100
commit7cfd7ab2b1244681e384ec4640ee6e528881f4af (patch)
tree2ac466eeb6fff75f32c0025f98148bb13d73630b /tests
parent977a335ccd16e162d1aeaf0ab569afe98faed0f4 (diff)
[new compiler] Fix timing of property assignment error handling
Most property assignment errors are now handled at type compile time, just like in the old compiler. This speeds up the object creation code and restores behavior expected in the qqmllanguage tests. Change-Id: If213cd0bfa4dd51d9065c27809a79a6495c9f3ce Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index fade1256b0..0a40e2cde2 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -520,13 +520,11 @@ void tst_qqmllanguage::errors()
{
QFETCH(QString, file);
QFETCH(QString, errorFile);
- // ### FIXME: re-enable these create "checks" when the new compiler is default and does property binding compatibility tests
- // in the loader thread.
-// QFETCH(bool, create);
+ QFETCH(bool, create);
QQmlComponent component(&engine, testFileUrl(file));
- if (/*create && */component.isReady()) {
+ if (create) {
QObject *object = component.create();
QVERIFY(object == 0);
}