1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Declare StandardButton & ButtonRole types for cross-thread use.

Browse Source 
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>
This commit is contained in:
Samuel Nevala 2015-08-26 15:30:36 +03:00
parent 9ff74f1487
commit 8c1fcbcd83
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qplatformdialoghelper.cpp
View File

@ -119,6 +119,8 @@ static const int buttonRoleLayouts[2][5][14] =
QPlatformDialogHelper::QPlatformDialogHelper() QPlatformDialogHelper::QPlatformDialogHelper()
{ {
qRegisterMetaType<StandardButton>();
qRegisterMetaType<ButtonRole>();
} }
QPlatformDialogHelper::~QPlatformDialogHelper() QPlatformDialogHelper::~QPlatformDialogHelper()

5
src/gui/kernel/qplatformdialoghelper.h
View File

@ -160,6 +160,11 @@ Q_SIGNALS:
void reject(); void reject();
}; };
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QPlatformDialogHelper::StandardButton)
Q_DECLARE_METATYPE(QPlatformDialogHelper::ButtonRole)
QT_BEGIN_NAMESPACE
class Q_GUI_EXPORT QColorDialogOptions class Q_GUI_EXPORT QColorDialogOptions
{ {
public: public: