projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
21e162d
)
Allow disabling of component complete signal for the designer
author
Thomas Hartmann
<Thomas.Hartmann@digia.com>
Thu, 18 Apr 2013 14:09:08 +0000 (16:09 +0200)
committer
The Qt Project
<gerrit-noreply@qt-project.org>
Sat, 20 Apr 2013 13:10:19 +0000 (15:10 +0200)
We emit the signal later in the designer.
Change-Id: I5da4a2234467444446f168888a3ad3682f4ccc22
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
src/qml/qml/qqmlvme.cpp
patch
|
blob
|
history
diff --git
a/src/qml/qml/qqmlvme.cpp
b/src/qml/qml/qqmlvme.cpp
index
c34b922
..
ad76b70
100644
(file)
--- a/
src/qml/qml/qqmlvme.cpp
+++ b/
src/qml/qml/qqmlvme.cpp
@@
-1376,7
+1376,8
@@
QQmlContextData *QQmlVME::complete(const Interrupt &interrupt)
Q_ASSERT(d);
Q_ASSERT(d->context);
a->add(&d->context->componentAttached);
- emit a->completed();
+ if (componentCompleteEnabled())
+ emit a->completed();
if (watcher.hasRecursed() || interrupt.shouldInterrupt())
return 0;