From b6b853b1b64175c191e776ffbf297bdc9de0a0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Wed, 27 Jul 2011 15:10:16 +0200 Subject: Initial OpenWFD support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I06f71073ec58af1a431edb997f3a359800320196 Reviewed-on: http://codereview.qt.nokia.com/2288 Reviewed-by: Qt Sanity Bot Reviewed-by: Samuel Rødal --- .../platforms/openwfd/qopenwfdintegration.h | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 src/plugins/platforms/openwfd/qopenwfdintegration.h (limited to 'src/plugins/platforms/openwfd/qopenwfdintegration.h') diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h new file mode 100644 index 0000000000..9b7b5329dc --- /dev/null +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** 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 QOPENWFDINTEGRATION_H +#define QOPENWFDINTEGRATION_H + +#include +#include + +QT_BEGIN_NAMESPACE + +class QOpenWFDDevice; +class QOpenWFDScreen; + +class QOpenWFDIntegration : public QPlatformIntegration +{ +public: + QOpenWFDIntegration(); + ~QOpenWFDIntegration(); + + bool hasCapability(Capability cap) const; + QPlatformWindow *createPlatformWindow(QWindow *window) const; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; + QPlatformGLContext *createPlatformGLContext(QGuiGLContext *context) const; + + //This should not be a factory interface, but rather a accessor + QAbstractEventDispatcher *createEventDispatcher() const; + + QPlatformFontDatabase *fontDatabase() const; + + QPlatformNativeInterface *nativeInterface()const; + + QPlatformPrinterSupport *printerSupport() const; + + void addScreen(QOpenWFDScreen *screen); +private: + QList mScreens; + QListmDevices; + + QPlatformFontDatabase *mFontDatabase; + QPlatformNativeInterface *mNativeInterface; + QPlatformPrinterSupport *mPrinterSupport; +}; + +QT_END_NAMESPACE + +#endif -- cgit v1.2.3 From dfd72c6e6c5aab58bd56c8f7854e94df2230bd8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Wed, 27 Jul 2011 16:54:53 +0200 Subject: Make QPlatformIntegration not have a factory for eventdispatcher MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit but rather an accessor for the guiThreadEventDispatcher Change-Id: I1b9ba14efc9f338c5a67e3e24ddb0caf76c07413 Reviewed-on: http://codereview.qt.nokia.com/2321 Reviewed-by: Qt Sanity Bot Reviewed-by: Samuel Rødal --- src/plugins/platforms/openwfd/qopenwfdintegration.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/platforms/openwfd/qopenwfdintegration.h') diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h index 9b7b5329dc..18d87fd90e 100644 --- a/src/plugins/platforms/openwfd/qopenwfdintegration.h +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h @@ -62,7 +62,7 @@ public: QPlatformGLContext *createPlatformGLContext(QGuiGLContext *context) const; //This should not be a factory interface, but rather a accessor - QAbstractEventDispatcher *createEventDispatcher() const; + QAbstractEventDispatcher *guiThreadEventDispatcher() const; QPlatformFontDatabase *fontDatabase() const; @@ -78,6 +78,7 @@ private: QPlatformFontDatabase *mFontDatabase; QPlatformNativeInterface *mNativeInterface; QPlatformPrinterSupport *mPrinterSupport; + QAbstractEventDispatcher *mEventDispatcher; }; QT_END_NAMESPACE -- cgit v1.2.3 From 6e28e8441b698c3397c2c78125c877f2e9867cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Mon, 22 Aug 2011 10:49:28 +0200 Subject: Copy core GL functionality to QtGui with QGL -> QOpenGL naming. Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855 Reviewed-on: http://codereview.qt.nokia.com/3710 Reviewed-by: Gunnar Sletta --- src/plugins/platforms/openwfd/qopenwfdintegration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/platforms/openwfd/qopenwfdintegration.h') diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h index 18d87fd90e..b5315b31da 100644 --- a/src/plugins/platforms/openwfd/qopenwfdintegration.h +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h @@ -59,7 +59,7 @@ public: bool hasCapability(Capability cap) const; QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; - QPlatformGLContext *createPlatformGLContext(QGuiGLContext *context) const; + QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const; //This should not be a factory interface, but rather a accessor QAbstractEventDispatcher *guiThreadEventDispatcher() const; -- cgit v1.2.3