diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 15:57:03 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 15:57:11 +0100 |
| commit | 27016b89ae49da091527548af0ca9022ec4d7902 (patch) | |
| tree | de408d49d52dd6a73e75a612ef51342d6ee44638 /src/corelib/kernel | |
| parent | 3683bc97d2ebc0de3272fc09656b90a88f5eb326 (diff) | |
| parent | fbaa6d3ca6fc2693c5c8a1cd8e565803adc97730 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Idec54e19963e8d88c711cb179cffc81596323899
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreevent.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index cce385352e..62c76c1a40 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -274,6 +274,7 @@ QT_BEGIN_NAMESPACE \omitvalue NetworkReplyUpdated \omitvalue FutureCallOut \omitvalue NativeGesture + \omitvalue WindowChangeInternal */ /*! diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index e974c4d226..3ee0eaaa61 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -278,6 +278,8 @@ public: StyleAnimationUpdate = 213, // style animation target should be updated ApplicationStateChange = 214, + WindowChangeInternal = 215, // internal for QQuickWidget + // 512 reserved for Qt Jambi's MetaCall event // 513 reserved for Qt Jambi's DeleteOnMainThread event |