diff options
-rw-r--r-- | src/gui/kernel/kernel.pri | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreen.cpp | 9 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreen.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreenpageflipper.cpp | 121 | ||||
-rw-r--r-- | src/gui/kernel/qplatformscreenpageflipper.h | 92 | ||||
-rw-r--r-- | src/plugins/platforms/winrt/qwinrteventdispatcher.cpp | 1 |
6 files changed, 0 insertions, 227 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index c2422ec98b..1169985ea8 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -66,7 +66,6 @@ HEADERS += \ kernel/qplatformsharedgraphicscache.h \ kernel/qplatformdialoghelper.h \ kernel/qplatformservices.h \ - kernel/qplatformscreenpageflipper.h \ kernel/qplatformsystemtrayicon.h \ kernel/qplatformsessionmanager.h \ kernel/qpixelformat.h \ @@ -120,7 +119,6 @@ SOURCES += \ kernel/qplatformsharedgraphicscache.cpp \ kernel/qplatformdialoghelper.cpp \ kernel/qplatformservices.cpp \ - kernel/qplatformscreenpageflipper.cpp \ kernel/qplatformsystemtrayicon.cpp \ kernel/qplatformsessionmanager.cpp \ kernel/qplatformmenu.cpp \ diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp index 05d04ae4ee..0c47005807 100644 --- a/src/gui/kernel/qplatformscreen.cpp +++ b/src/gui/kernel/qplatformscreen.cpp @@ -275,15 +275,6 @@ QPlatformScreen * QPlatformScreen::platformScreenForWindow(const QWindow *window */ /*! - Implemented in subclasses to return a page flipper object for the screen, or 0 if the - hardware does not support page flipping. The default implementation returns 0. - */ -QPlatformScreenPageFlipper *QPlatformScreen::pageFlipper() const -{ - return 0; -} - -/*! Reimplement this function in subclass to return the cursor of the screen. The default implementation returns 0. diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h index 085a147e8d..151a6386d9 100644 --- a/src/gui/kernel/qplatformscreen.h +++ b/src/gui/kernel/qplatformscreen.h @@ -71,7 +71,6 @@ class QPlatformOpenGLContext; class QPlatformScreenPrivate; class QPlatformWindow; class QPlatformCursor; -class QPlatformScreenPageFlipper; class QScreen; class QSurfaceFormat; @@ -115,7 +114,6 @@ public: virtual QString name() const { return QString(); } - virtual QPlatformScreenPageFlipper *pageFlipper() const; virtual QPlatformCursor *cursor() const; protected: diff --git a/src/gui/kernel/qplatformscreenpageflipper.cpp b/src/gui/kernel/qplatformscreenpageflipper.cpp deleted file mode 100644 index 8665adc463..0000000000 --- a/src/gui/kernel/qplatformscreenpageflipper.cpp +++ /dev/null @@ -1,121 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, 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, Digia gives you certain additional -** rights. These rights are described in the Digia 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. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qplatformscreenpageflipper.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QPlatformScreenBuffer - \since 5.0 - \internal - \preliminary - \ingroup qpa - - \brief The QPlatformScreenBuffer class provides an abstraction for screen buffers. - */ -QPlatformScreenBuffer::QPlatformScreenBuffer() - : m_destroyed(false) - , m_ready(true) -{ - -} - -QPlatformScreenBuffer::~QPlatformScreenBuffer() -{ - -} - -bool QPlatformScreenBuffer::isDestroyed() const -{ - return m_destroyed; -} - -bool QPlatformScreenBuffer::isReady() const -{ - return m_ready; -} - -void QPlatformScreenBuffer::aboutToBeDisplayed() -{ -} - -void QPlatformScreenBuffer::displayed() -{ -} - - -/*! - \class QPlatformScreenPageFlipper - \since 5.0 - \internal - \preliminary - \ingroup qpa - - \brief The QPlatformScreenPageFlipper class provides an abstract interface for display buffer swapping - - Implement the displayBuffer() function to initiate a buffer swap. The - bufferDisplayed() signal should be emitted once the buffer is actually displayed on - the screen. The bufferReleased() signal should be emitted when the buffer data is no - longer owned by the display hardware. -*/ - -QPlatformScreenPageFlipper::QPlatformScreenPageFlipper(QObject *parent) - :QObject(parent) -{ - -} - -/*! - \fn bool QPlatformScreenPageFlipper::displayBuffer(QPlatformScreenBuffer *buffer) - - Implemented in subclasses to display \a buffer directly on the screen. Returns \c true - if it is possible to display the buffer, and \c false if the buffer cannot be displayed. - - If this function returns \c true, the buffer must not be modified or destroyed before the - bufferReleased() signal is emitted. The signal bufferDisplayed() is emitted when the buffer - is displayed on the screen. The two signals may be emitted in either order. - - This function is allowed to block. -*/ - -QT_END_NAMESPACE - diff --git a/src/gui/kernel/qplatformscreenpageflipper.h b/src/gui/kernel/qplatformscreenpageflipper.h deleted file mode 100644 index 232e37d24a..0000000000 --- a/src/gui/kernel/qplatformscreenpageflipper.h +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, 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, Digia gives you certain additional -** rights. These rights are described in the Digia 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. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPLATFORMSCREENPAGEFLIPPER_H -#define QPLATFORMSCREENPAGEFLIPPER_H - -// -// W A R N I N G -// ------------- -// -// This file is part of the QPA API and is not meant to be used -// in applications. Usage of this API may make your code -// source and binary incompatible with future versions of Qt. -// - -#include <QtCore/QObject> - -QT_BEGIN_NAMESPACE - -class Q_GUI_EXPORT QPlatformScreenBuffer { -public: - QPlatformScreenBuffer(); - virtual ~QPlatformScreenBuffer(); - - bool isDestroyed() const; - bool isReady() const; - - virtual void aboutToBeDisplayed(); - virtual void displayed(); - virtual void release() = 0; - - virtual void *handle() const = 0; - -protected: - bool m_destroyed; - bool m_ready; -}; - -class Q_GUI_EXPORT QPlatformScreenPageFlipper : public QObject -{ - Q_OBJECT -public: - explicit QPlatformScreenPageFlipper(QObject *parent = 0); - - virtual bool displayBuffer(QPlatformScreenBuffer *) = 0; - -Q_SIGNALS: - void bufferDisplayed(QPlatformScreenBuffer *); - void bufferReleased(QPlatformScreenBuffer *); -}; - -QT_END_NAMESPACE - -#endif // QPLATFORMSCREENPAGEFLIPPER_H diff --git a/src/plugins/platforms/winrt/qwinrteventdispatcher.cpp b/src/plugins/platforms/winrt/qwinrteventdispatcher.cpp index 98eb83f5eb..2bc8e6602f 100644 --- a/src/plugins/platforms/winrt/qwinrteventdispatcher.cpp +++ b/src/plugins/platforms/winrt/qwinrteventdispatcher.cpp @@ -42,7 +42,6 @@ #include "qwinrteventdispatcher.h" #include <qpa/qwindowsysteminterface.h> #include <qpa/qplatformscreen.h> -#include <qpa/qplatformscreenpageflipper.h> #include <QtCore/QThread> #include <QtGui/QGuiApplication> |