aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-03-30 15:16:10 +0200
committerLiang Qi <liang.qi@qt.io>2017-03-30 17:29:56 +0000
commite4894fe13d178b6aa8b5580b402df2d1b4f2615c (patch)
treedd8f3ee61bb6591ac0fd4d2583e671099e89130f /src
parent22cc4d6707132c3914b43ca3ed5c7d1f354d84b6 (diff)
Don't use incremental GC for now
Revert back to not using the incremental garbage collector for now, as it apparently doesn't play well with weak values. This should fix the crashes seen in Qt Quick Controls 2 in CI Task-number: QTBUG-59600 Change-Id: I8e35e761d5d6e9022e1d183883cb5a9cb39b4975 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qml/memory/qv4writebarrier_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/memory/qv4writebarrier_p.h b/src/qml/memory/qv4writebarrier_p.h
index 455de4bf3d..a2f85822ca 100644
--- a/src/qml/memory/qv4writebarrier_p.h
+++ b/src/qml/memory/qv4writebarrier_p.h
@@ -55,8 +55,8 @@
QT_BEGIN_NAMESPACE
-#define WRITEBARRIER_steele 1
-#define WRITEBARRIER_none -1
+#define WRITEBARRIER_steele -1
+#define WRITEBARRIER_none 1
#define WRITEBARRIER(x) (1/WRITEBARRIER_##x == 1)