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

QNX: Fix window focus problems when using QNX 6.5.0.

Browse Source 
In blackberry, activation events come through the navigator,
but we might not have a navigator.

Change-Id: I0d9e1a08336aa403035fdf00be46d839a83f4b58
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Sergio Martins 2012-11-16 16:31:49 +00:00 committed by The Qt Project
parent bc6228c3f4
commit 779ef8bb7e
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/qnx/qqnxintegration.cpp
View File

@ -518,4 +518,10 @@ QQnxScreen *QQnxIntegration::primaryDisplay() const
return m_screens.first(); return m_screens.first();
} }
bool QQnxIntegration::supportsNavigatorEvents() const
{
// If QQNX_PPS or Q_OS_BLACKBERRY is defined then we have navigator
return m_navigator != 0;
}
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/platforms/qnx/qqnxintegration.h
View File

@ -98,6 +98,8 @@ public:
void moveToScreen(QWindow *window, int screen); void moveToScreen(QWindow *window, int screen);
bool supportsNavigatorEvents() const;
QAbstractEventDispatcher *guiThreadEventDispatcher() const; QAbstractEventDispatcher *guiThreadEventDispatcher() const;
QPlatformFontDatabase *fontDatabase() const { return m_fontDatabase; } QPlatformFontDatabase *fontDatabase() const { return m_fontDatabase; }

5
src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
View File

@ -276,6 +276,11 @@ void QQnxScreenEventHandler::handlePointerEvent(screen_event_t event)
qScreenEventDebug() << Q_FUNC_INFO << "Qt enter, w=" << w; qScreenEventDebug() << Q_FUNC_INFO << "Qt enter, w=" << w;
} }
} }
// If we don't have a navigator, we don't get activation events.
if (buttonState && w && w != QGuiApplication::focusWindow() && !m_qnxIntegration->supportsNavigatorEvents())
QWindowSystemInterface::handleWindowActivated(w);
m_lastMouseWindow = qnxWindow; m_lastMouseWindow = qnxWindow;
// Apply scaling to wheel delta and invert value for Qt. We'll probably want to scale // Apply scaling to wheel delta and invert value for Qt. We'll probably want to scale