Add a native interface with the possibility to query the window group
This is needed for QtMultimedia, as it uses the native mmrenderer API which expects to get passed the window group when creating a video overlay window. Change-Id: I07d790e6e20714741c04917068b41b71b8939fa4 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
This commit is contained in:
parent
5dd7cd5316
commit
f5bc6db6c3
@ -38,8 +38,8 @@ SOURCES = main.cpp \
|
|||||||
qqnxclipboard.cpp \
|
qqnxclipboard.cpp \
|
||||||
qqnxrootwindow.cpp \
|
qqnxrootwindow.cpp \
|
||||||
qqnxscreeneventhandler.cpp \
|
qqnxscreeneventhandler.cpp \
|
||||||
qqnxabstractvirtualkeyboard.cpp
|
qqnxabstractvirtualkeyboard.cpp \
|
||||||
|
qqnxnativeinterface.cpp
|
||||||
|
|
||||||
HEADERS = qqnxbuffer.h \
|
HEADERS = qqnxbuffer.h \
|
||||||
qqnxeventthread.h \
|
qqnxeventthread.h \
|
||||||
@ -55,7 +55,8 @@ HEADERS = qqnxbuffer.h \
|
|||||||
qqnxclipboard.h \
|
qqnxclipboard.h \
|
||||||
qqnxrootwindow.h \
|
qqnxrootwindow.h \
|
||||||
qqnxscreeneventhandler.h \
|
qqnxscreeneventhandler.h \
|
||||||
qqnxabstractvirtualkeyboard.h
|
qqnxabstractvirtualkeyboard.h \
|
||||||
|
qqnxnativeinterface.h
|
||||||
|
|
||||||
CONFIG(blackberry) {
|
CONFIG(blackberry) {
|
||||||
SOURCES += qqnxservices.cpp
|
SOURCES += qqnxservices.cpp
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
#include "qqnxeventthread.h"
|
#include "qqnxeventthread.h"
|
||||||
#include "qqnxglbackingstore.h"
|
#include "qqnxglbackingstore.h"
|
||||||
#include "qqnxglcontext.h"
|
#include "qqnxglcontext.h"
|
||||||
|
#include "qqnxnativeinterface.h"
|
||||||
#include "qqnxnavigatoreventhandler.h"
|
#include "qqnxnavigatoreventhandler.h"
|
||||||
#include "qqnxrasterbackingstore.h"
|
#include "qqnxrasterbackingstore.h"
|
||||||
#include "qqnxscreen.h"
|
#include "qqnxscreen.h"
|
||||||
@ -85,6 +86,7 @@ QQnxIntegration::QQnxIntegration()
|
|||||||
, m_fontDatabase(new QGenericUnixFontDatabase())
|
, m_fontDatabase(new QGenericUnixFontDatabase())
|
||||||
, m_paintUsingOpenGL(false)
|
, m_paintUsingOpenGL(false)
|
||||||
, m_eventDispatcher(createUnixEventDispatcher())
|
, m_eventDispatcher(createUnixEventDispatcher())
|
||||||
|
, m_nativeInterface(new QQnxNativeInterface())
|
||||||
, m_services(0)
|
, m_services(0)
|
||||||
, m_screenEventHandler(new QQnxScreenEventHandler())
|
, m_screenEventHandler(new QQnxScreenEventHandler())
|
||||||
#ifndef QT_NO_CLIPBOARD
|
#ifndef QT_NO_CLIPBOARD
|
||||||
@ -149,6 +151,8 @@ QQnxIntegration::~QQnxIntegration()
|
|||||||
|
|
||||||
delete m_screenEventHandler;
|
delete m_screenEventHandler;
|
||||||
|
|
||||||
|
delete m_nativeInterface;
|
||||||
|
|
||||||
// Destroy input context
|
// Destroy input context
|
||||||
delete m_inputContext;
|
delete m_inputContext;
|
||||||
|
|
||||||
@ -259,6 +263,11 @@ QAbstractEventDispatcher *QQnxIntegration::guiThreadEventDispatcher() const
|
|||||||
return m_eventDispatcher;
|
return m_eventDispatcher;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QPlatformNativeInterface *QQnxIntegration::nativeInterface() const
|
||||||
|
{
|
||||||
|
return m_nativeInterface;
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef QT_NO_CLIPBOARD
|
#ifndef QT_NO_CLIPBOARD
|
||||||
QPlatformClipboard *QQnxIntegration::clipboard() const
|
QPlatformClipboard *QQnxIntegration::clipboard() const
|
||||||
{
|
{
|
||||||
|
@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
|
|||||||
|
|
||||||
class QQnxEventThread;
|
class QQnxEventThread;
|
||||||
class QQnxInputContext;
|
class QQnxInputContext;
|
||||||
|
class QQnxNativeInterface;
|
||||||
class QQnxNavigatorEventHandler;
|
class QQnxNavigatorEventHandler;
|
||||||
class QQnxAbstractVirtualKeyboard;
|
class QQnxAbstractVirtualKeyboard;
|
||||||
class QQnxWindow;
|
class QQnxWindow;
|
||||||
@ -86,6 +87,8 @@ public:
|
|||||||
|
|
||||||
QPlatformFontDatabase *fontDatabase() const { return m_fontDatabase; }
|
QPlatformFontDatabase *fontDatabase() const { return m_fontDatabase; }
|
||||||
|
|
||||||
|
QPlatformNativeInterface *nativeInterface() const;
|
||||||
|
|
||||||
#ifndef QT_NO_CLIPBOARD
|
#ifndef QT_NO_CLIPBOARD
|
||||||
QPlatformClipboard *clipboard() const;
|
QPlatformClipboard *clipboard() const;
|
||||||
#endif
|
#endif
|
||||||
@ -114,6 +117,7 @@ private:
|
|||||||
QPlatformFontDatabase *m_fontDatabase;
|
QPlatformFontDatabase *m_fontDatabase;
|
||||||
bool m_paintUsingOpenGL;
|
bool m_paintUsingOpenGL;
|
||||||
QAbstractEventDispatcher *m_eventDispatcher;
|
QAbstractEventDispatcher *m_eventDispatcher;
|
||||||
|
QQnxNativeInterface *m_nativeInterface;
|
||||||
QQnxServices *m_services;
|
QQnxServices *m_services;
|
||||||
QList<QQnxScreen*> m_screens;
|
QList<QQnxScreen*> m_screens;
|
||||||
QQnxScreenEventHandler *m_screenEventHandler;
|
QQnxScreenEventHandler *m_screenEventHandler;
|
||||||
|
65
src/plugins/platforms/qnx/qqnxnativeinterface.cpp
Normal file
65
src/plugins/platforms/qnx/qqnxnativeinterface.cpp
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2012 Research In Motion
|
||||||
|
** Contact: http://www.qt-project.org/
|
||||||
|
**
|
||||||
|
** This file is part of the plugins of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** This file may be used under the terms of the GNU Lesser General Public
|
||||||
|
** License version 2.1 as published by the Free Software Foundation and
|
||||||
|
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||||
|
** file. Please review the following information to ensure the GNU Lesser
|
||||||
|
** General Public License version 2.1 requirements will be met:
|
||||||
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** In addition, as a special exception, Nokia gives you certain additional
|
||||||
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** GNU General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU General
|
||||||
|
** Public License version 3.0 as published by the Free Software Foundation
|
||||||
|
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||||
|
** file. Please review the following information to ensure the GNU General
|
||||||
|
** Public License version 3.0 requirements will be met:
|
||||||
|
** http://www.gnu.org/copyleft/gpl.html.
|
||||||
|
**
|
||||||
|
** Other Usage
|
||||||
|
** Alternatively, this file may be used in accordance with the terms and
|
||||||
|
** conditions contained in a signed written agreement between you and Nokia.
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include "qqnxnativeinterface.h"
|
||||||
|
|
||||||
|
#include "qqnxscreen.h"
|
||||||
|
|
||||||
|
#include <QtGui/QScreen>
|
||||||
|
#include <QtGui/QWindow>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
void *QQnxNativeInterface::nativeResourceForWindow(const QByteArray &resource, QWindow *window)
|
||||||
|
{
|
||||||
|
if (resource == "windowGroup" && window && window->screen()) {
|
||||||
|
const QQnxScreen * const screen = static_cast<QQnxScreen *>(window->screen()->handle());
|
||||||
|
if (screen) {
|
||||||
|
// We can't just call data() instead of constData() here, since that would detach
|
||||||
|
// and the lifetime of the char * would not be long enough. Therefore the const_cast.
|
||||||
|
return const_cast<char *>(screen->rootWindow()->groupName().constData());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
57
src/plugins/platforms/qnx/qqnxnativeinterface.h
Normal file
57
src/plugins/platforms/qnx/qqnxnativeinterface.h
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2012 Research In Motion
|
||||||
|
** Contact: http://www.qt-project.org/
|
||||||
|
**
|
||||||
|
** This file is part of the plugins of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** This file may be used under the terms of the GNU Lesser General Public
|
||||||
|
** License version 2.1 as published by the Free Software Foundation and
|
||||||
|
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||||
|
** file. Please review the following information to ensure the GNU Lesser
|
||||||
|
** General Public License version 2.1 requirements will be met:
|
||||||
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** In addition, as a special exception, Nokia gives you certain additional
|
||||||
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** GNU General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU General
|
||||||
|
** Public License version 3.0 as published by the Free Software Foundation
|
||||||
|
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||||
|
** file. Please review the following information to ensure the GNU General
|
||||||
|
** Public License version 3.0 requirements will be met:
|
||||||
|
** http://www.gnu.org/copyleft/gpl.html.
|
||||||
|
**
|
||||||
|
** Other Usage
|
||||||
|
** Alternatively, this file may be used in accordance with the terms and
|
||||||
|
** conditions contained in a signed written agreement between you and Nokia.
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifndef QQNXNATIVEINTERFACE_H
|
||||||
|
#define QQNXNATIVEINTERFACE_H
|
||||||
|
|
||||||
|
#include <QtGui/QPlatformNativeInterface>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
class QQnxNativeInterface : public QPlatformNativeInterface
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
void *nativeResourceForWindow(const QByteArray &resource, QWindow *window);
|
||||||
|
};
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#endif // QQNXNATIVEINTERFACE_H
|
Loading…
Reference in New Issue
Block a user