diff options
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/opengl.pro | 2 | ||||
-rw-r--r-- | src/opengl/qglcolormap.h | 1 | ||||
-rw-r--r-- | src/opengl/qgraphicsshadereffect_p.h | 1 | ||||
-rw-r--r-- | src/opengl/qtopenglglobal.h | 65 |
4 files changed, 68 insertions, 1 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 1649651ce7..8c291c862b 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -29,7 +29,7 @@ HEADERS += qgl.h \ qglextensions_p.h \ qglpaintdevice_p.h \ qglbuffer.h \ - + qtopenglglobal.h SOURCES += qgl.cpp \ qglcolormap.cpp \ diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h index 93bdf9db89..a41217cc5b 100644 --- a/src/opengl/qglcolormap.h +++ b/src/opengl/qglcolormap.h @@ -44,6 +44,7 @@ #include <QtGui/qcolor.h> #include <QtCore/qvector.h> +#include <QtOpenGL/qtopenglglobal.h> QT_BEGIN_HEADER diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h index 10f657944c..2c9d3e711c 100644 --- a/src/opengl/qgraphicsshadereffect_p.h +++ b/src/opengl/qgraphicsshadereffect_p.h @@ -54,6 +54,7 @@ // #include <QtWidgets/qgraphicseffect.h> +#include <QtOpenGL/qtopenglglobal.h> QT_BEGIN_HEADER diff --git a/src/opengl/qtopenglglobal.h b/src/opengl/qtopenglglobal.h new file mode 100644 index 0000000000..914ef3ed44 --- /dev/null +++ b/src/opengl/qtopenglglobal.h @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Intel Corporation. +** Contact: http://www.qt-project.org/ +** +** This file is part of the QtCore module 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 QTOPENGLGLOBAL_H +#define QTOPENGLGLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_OPENGL_LIB) +# define Q_OPENGL_EXPORT Q_DECL_EXPORT +# else +# define Q_OPENGL_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_OPENGL_EXPORT +#endif + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QTOPENGLGLOBAL_H |