AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QWidgetWindow: Avoid using global static non-trivial type.

Browse Source 
Don't initialize it before main, instead, do it whenever
QWidgetWindow::handleTabletEvent() is called, which is seldomly.

Change-Id: I16935e223d4f9879257e7be026fee0215b9dde22
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Sérgio Martins 2015-05-24 00:33:18 +01:00
parent decd18536c
commit 8458b4054a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/kernel/qwidgetwindow.cpp
View File

@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE
Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets(); Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets();
QWidget *qt_button_down = 0; // widget got last button-down QWidget *qt_button_down = 0; // widget got last button-down
static QPointer<QWidget> qt_tablet_target = 0;
// popup control // popup control
QWidget *qt_popup_down = 0; // popup that contains the pressed widget QWidget *qt_popup_down = 0; // popup that contains the pressed widget
@ -873,6 +872,7 @@ bool QWidgetWindow::nativeEvent(const QByteArray &eventType, void *message, long
#ifndef QT_NO_TABLETEVENT #ifndef QT_NO_TABLETEVENT
void QWidgetWindow::handleTabletEvent(QTabletEvent *event) void QWidgetWindow::handleTabletEvent(QTabletEvent *event)
{ {
static QPointer<QWidget> qt_tablet_target = 0;
if (event->type() == QEvent::TabletPress) { if (event->type() == QEvent::TabletPress) {
QWidget *widget = m_widget->childAt(event->pos()); QWidget *widget = m_widget->childAt(event->pos());
if (!widget) if (!widget)