diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-10 10:55:30 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-10 10:55:40 +0200 |
| commit | 6a8d15cc16875a2dce3d944b46eb21b3f72bb33b (patch) | |
| tree | 54e123dcff6eec1830d4ad6942e2c7b8dfb59b54 /depends/patches/qt/qt5-tablet-osx.patch | |
| parent | 4e8cc3cb86a52cd945393e68da0352b3b3f0715a (diff) | |
| parent | 21f139b4a622f07679f1d1c30ad32e2b40a2617e (diff) | |
Merge pull request #4874
21f139b qt: fix tablet crash. closes #4854. (Cory Fields)
Diffstat (limited to 'depends/patches/qt/qt5-tablet-osx.patch')
| -rw-r--r-- | depends/patches/qt/qt5-tablet-osx.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/depends/patches/qt/qt5-tablet-osx.patch b/depends/patches/qt/qt5-tablet-osx.patch new file mode 100644 index 0000000000..7deabf8d4e --- /dev/null +++ b/depends/patches/qt/qt5-tablet-osx.patch @@ -0,0 +1,20 @@ +--- old/qtbase/src/widgets/kernel/qwidgetwindow.cpp 2014-09-05 20:45:18.717570370 -0400 ++++ new/qtbase/src/widgets/kernel/qwidgetwindow.cpp 2014-09-05 20:52:38.653576561 -0400 +@@ -57,7 +57,7 @@ + Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets(); + + QWidget *qt_button_down = 0; // widget got last button-down +-static QWidget *qt_tablet_target = 0; ++static QPointer<QWidget> qt_tablet_target = 0; + + // popup control + QWidget *qt_popup_down = 0; // popup that contains the pressed widget +@@ -96,8 +96,6 @@ + + QWidgetWindow::~QWidgetWindow() + { +- if (m_widget == qt_tablet_target) +- qt_tablet_target = 0; + } + + #ifndef QT_NO_ACCESSIBILITY |