diff options
| author | Samuel Nevala <samuel.nevala@intopalo.com> | 2015-08-26 15:30:36 +0300 |
|---|---|---|
| committer | Samuel Nevala <samuel.nevala@intopalo.com> | 2015-08-31 11:57:48 +0000 |
| commit | 8c1fcbcd83214d7cc7efc63c12f907538664821e (patch) | |
| tree | 2bbb84ac8e1de5ba8801a3017a3d386bb4b2f41a /src | |
| parent | 9ff74f14876dea3a21c1dab389577c54e3bf1bc5 (diff) | |
Declare StandardButton & ButtonRole types for cross-thread use.
On windows phone native dialog interaction is handled from
XMAL thread. Declare and register dialog helpers StandardButton
and ButtonRole for cross-thread usage.
Change-Id: Ic1842a5af8a1122fdffb766b4f723d272bdbcac2
Task-Id: QTBUG-47941
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qplatformdialoghelper.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformdialoghelper.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index 20dc716d89..f69efe0935 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -119,6 +119,8 @@ static const int buttonRoleLayouts[2][5][14] = QPlatformDialogHelper::QPlatformDialogHelper() { + qRegisterMetaType<StandardButton>(); + qRegisterMetaType<ButtonRole>(); } QPlatformDialogHelper::~QPlatformDialogHelper() diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h index ec88770862..936dbdfa89 100644 --- a/src/gui/kernel/qplatformdialoghelper.h +++ b/src/gui/kernel/qplatformdialoghelper.h @@ -160,6 +160,11 @@ Q_SIGNALS: void reject(); }; +QT_END_NAMESPACE +Q_DECLARE_METATYPE(QPlatformDialogHelper::StandardButton) +Q_DECLARE_METATYPE(QPlatformDialogHelper::ButtonRole) +QT_BEGIN_NAMESPACE + class Q_GUI_EXPORT QColorDialogOptions { public: |