aboutsummaryrefslogtreecommitdiffstats
path: root/libpyside
diff options
context:
space:
mode:
authorempyrical <empyrical@users.noreply.github.com>2015-12-28 10:31:42 -0700
committerempyrical <empyrical@users.noreply.github.com>2015-12-28 10:31:42 -0700
commit1bc7b589aadfe46ea3ca93abc4f92ed3a4a04d2f (patch)
tree9f441ae4b118c37088de3f8c5be4426308ff9cdf /libpyside
parent7f0009ba3b9b3804a2cf85128ad28cfcb714efa7 (diff)
Only use engine->current in Qt 5.6 and up
Diffstat (limited to 'libpyside')
-rw-r--r--libpyside/signalmanager.cpp.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/libpyside/signalmanager.cpp.in b/libpyside/signalmanager.cpp.in
index 8abddd1ae..10bab3cdf 100644
--- a/libpyside/signalmanager.cpp.in
+++ b/libpyside/signalmanager.cpp.in
@@ -474,7 +474,12 @@ int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id,
if (data || !data->jsWrapper.isNullOrUndefined()) {
QV4::ExecutionEngine *engine = data->jsWrapper.engine();
+
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
QV4::Heap::ExecutionContext *ctx = engine->current;
+ #else
+ QV4::Heap::ExecutionContext *ctx = engine->currentContext();
+ #endif
if (ctx->type == QV4::Heap::ExecutionContext::ContextType::Type_CallContext ||
ctx->type == QV4::Heap::ExecutionContext::ContextType::Type_SimpleCallContext) {