diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2016-05-20 11:52:40 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-23 19:21:13 +0000 |
| commit | 33167f76410e4c864f075838bd618da3ae973659 (patch) | |
| tree | 8969c550b5a731fdc48a15a86067995189e10645 /src/core/aspects/qabstractaspect.cpp | |
| parent | 9e07d3ae8f5b90b84735b3b8b81fa6c749a646b2 (diff) | |
initializeFromPeer last when creating backend node
This fixes issue with the focus handling in KeyHandler since
initializeFromPeer checks the enabled state to request focus or not.
Change-Id: Ib33f6a7fcec3cb96c1a71b3e6ba0be5f8eb942ed
Task-number: QTBUG-53358
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/aspects/qabstractaspect.cpp')
| -rw-r--r-- | src/core/aspects/qabstractaspect.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 95c81e15e..fbdaf30da 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -196,7 +196,6 @@ QBackendNode *QAbstractAspectPrivate::createBackendNode(const QNodeCreatedChange // TODO: Find some place else to do all of this function from the arbiter backend->setPeerId(change->subjectId()); - backend->initializeFromPeer(change); // Backend could be null if the user decides that his functor should only // perform some action when encountering a given type of item but doesn't need to @@ -204,6 +203,9 @@ QBackendNode *QAbstractAspectPrivate::createBackendNode(const QNodeCreatedChange QBackendNodePrivate *backendPriv = QBackendNodePrivate::get(backend); backendPriv->setEnabled(change->isNodeEnabled()); + + backend->initializeFromPeer(change); + // TO DO: Find a way to specify the changes to observe // Register backendNode with QChangeArbiter if (m_arbiter != nullptr) { // Unit tests may not have the arbiter registered |