|
|
| @@ -1,289 +0,0 @@
-diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
-index 1169985..c2422ec 100644
---- a/src/gui/kernel/kernel.pri
-+++ b/src/gui/kernel/kernel.pri
-@@ -66,6 +66,7 @@ HEADERS += \
- kernel/qplatformsharedgraphicscache.h \
- kernel/qplatformdialoghelper.h \
- kernel/qplatformservices.h \
-+ kernel/qplatformscreenpageflipper.h \
- kernel/qplatformsystemtrayicon.h \
- kernel/qplatformsessionmanager.h \
- kernel/qpixelformat.h \
-@@ -119,6 +120,7 @@ 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 71710d1..bfe15d3 100644
---- a/src/gui/kernel/qplatformscreen.cpp
-+++ b/src/gui/kernel/qplatformscreen.cpp
-@@ -267,6 +267,15 @@ 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 2ca1261..101be30 100644
---- a/src/gui/kernel/qplatformscreen.h
-+++ b/src/gui/kernel/qplatformscreen.h
-@@ -63,6 +63,7 @@ class QPlatformOpenGLContext;
- class QPlatformScreenPrivate;
- class QPlatformWindow;
- class QPlatformCursor;
-+class QPlatformScreenPageFlipper;
- class QScreen;
- class QSurfaceFormat;
-
-@@ -106,6 +107,7 @@ 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
-new file mode 100644
-index 0000000..3fb469f
---- /dev/null
-+++ b/src/gui/kernel/qplatformscreenpageflipper.cpp
-@@ -0,0 +1,121 @@
-+/****************************************************************************
-+**
-+** 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)
-+{
-+ qRegisterMetaType<QPlatformScreenBuffer *>();
-+}
-+
-+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 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
-new file mode 100644
-index 0000000..880c5e1
---- /dev/null
-+++ b/src/gui/kernel/qplatformscreenpageflipper.h
-@@ -0,0 +1,96 @@
-+/****************************************************************************
-+**
-+** 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.
|
| @@ -1,34 +0,0 @@
-diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
-index 7cc3300..e499da8 100644
---- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
-+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
-@@ -102,14 +102,14 @@ QT_BEGIN_NAMESPACE
- #endif
-
- QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display,
-- EGLConfig *config, const QVariant &nativeHandle)
-+ EGLConfig config, const QVariant &nativeHandle)
- : m_eglDisplay(display)
- , m_swapInterval(-1)
- , m_swapIntervalEnvChecked(false)
- , m_swapIntervalFromEnv(-1)
- {
- if (nativeHandle.isNull()) {
-- m_eglConfig = config ? *config : q_configFromGLFormat(display, format);
-+ m_eglConfig = config ? config : q_configFromGLFormat(display, format);
- m_ownsContext = true;
- init(format, share);
- } else {
-diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
-index 7825c7b..b07b7e4 100644
---- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
-+++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h
-@@ -56,7 +56,7 @@ class QEGLPlatformContext : public QPlatformOpenGLContext
- {
- public:
- QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display,
-- EGLConfig *config = 0, const QVariant &nativeHandle = QVariant());
-+ EGLConfig config = 0, const QVariant &nativeHandle = QVariant());
- ~QEGLPlatformContext();
-
- bool makeCurrent(QPlatformSurface *surface);
|
