diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-04-06 15:53:55 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-06-25 12:39:07 +0200 |
commit | 27dc07fa050b5f216516debcd11802530a0c2d79 (patch) | |
tree | 30fd4a5663c84274d39e967eb6302ef44c2958f7 /src/platformheaders | |
parent | b69d537d7ffe385d374388a0754dd03ba25684c8 (diff) |
Support adapting an existing NSOpenGLContext in cocoa
Change-Id: I61b4055020c82dd5ac40850fe7def91d26ffb6fe
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/platformheaders')
-rw-r--r-- | src/platformheaders/nativecontexts/nativecontexts.pri | 3 | ||||
-rw-r--r-- | src/platformheaders/nativecontexts/qcocoanativecontext.h | 69 |
2 files changed, 71 insertions, 1 deletions
diff --git a/src/platformheaders/nativecontexts/nativecontexts.pri b/src/platformheaders/nativecontexts/nativecontexts.pri index 3fe62ea6fe..09ad14dd71 100644 --- a/src/platformheaders/nativecontexts/nativecontexts.pri +++ b/src/platformheaders/nativecontexts/nativecontexts.pri @@ -1,2 +1,3 @@ HEADERS += $$PWD/qglxnativecontext.h \ - $$PWD/qeglnativecontext.h + $$PWD/qeglnativecontext.h \ + $$PWD/qcocoanativecontext.h diff --git a/src/platformheaders/nativecontexts/qcocoanativecontext.h b/src/platformheaders/nativecontexts/qcocoanativecontext.h new file mode 100644 index 0000000000..e1cefd24b3 --- /dev/null +++ b/src/platformheaders/nativecontexts/qcocoanativecontext.h @@ -0,0 +1,69 @@ +/**************************************************************************** + ** + ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal + ** + ** This file is part of the plugins 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 QCOCOANATIVECONTEXT_H +#define QCOCOANATIVECONTEXT_H + +#include <AppKit/NSOpenGL.h> + +QT_BEGIN_NAMESPACE + +struct QCocoaNativeContext +{ + QCocoaNativeContext() + : m_context(0) + { } + + QCocoaNativeContext(NSOpenGLContext *ctx) + : m_context(ctx) + { } + + NSOpenGLContext *context() const { return m_context; } + +private: + NSOpenGLContext *m_context; +}; + +QT_END_NAMESPACE + +Q_DECLARE_METATYPE(QCocoaNativeContext) + +#endif // QCOCOANATIVECONTEXT_H |