diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-23 14:04:32 +0100 |
---|---|---|
committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-02-22 09:11:29 +0100 |
commit | 8471a422e3b4514904ce904aa5aadfab679b4190 (patch) | |
tree | 2c37013b1ce3f39172ce8657b7f7ca766ec94264 /src/gui/kernel/qopenglcontext.h | |
parent | 872af6811b2af366965f49280918d315a1f640ff (diff) | |
download | qtbase-8471a422e3b4514904ce904aa5aadfab679b4190.tar.gz |
Move QOpenGLVersionProfile to its own files
Prepare to move it out of QtGui
Task-number: QTBUG-74409
Change-Id: Iefde4945ede27cf3c2f6f50e5a693c03625cadf6
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/kernel/qopenglcontext.h')
-rw-r--r-- | src/gui/kernel/qopenglcontext.h | 52 |
1 files changed, 2 insertions, 50 deletions
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index a96ea56d7b..b26a3e2ede 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -59,12 +59,9 @@ #include <QtGui/qopengl.h> #include <QtGui/qopenglversionfunctions.h> +// TODO: ideally get rid of this include +#include <QtGui/qopenglversionprofile.h> -#if QT_DEPRECATED_SINCE(5, 6) -#include <QtCore/qhash.h> -#endif -#include <QtCore/qhashfunctions.h> -#include <QtCore/qpair.h> #include <QtCore/qvariant.h> QT_BEGIN_NAMESPACE @@ -79,50 +76,6 @@ class QPlatformOpenGLContext; class QScreen; class QSurface; -class QOpenGLVersionProfilePrivate; - -class Q_GUI_EXPORT QOpenGLVersionProfile -{ -public: - QOpenGLVersionProfile(); - explicit QOpenGLVersionProfile(const QSurfaceFormat &format); - QOpenGLVersionProfile(const QOpenGLVersionProfile &other); - ~QOpenGLVersionProfile(); - - QOpenGLVersionProfile &operator=(const QOpenGLVersionProfile &rhs); - - QPair<int, int> version() const; - void setVersion(int majorVersion, int minorVersion); - - QSurfaceFormat::OpenGLContextProfile profile() const; - void setProfile(QSurfaceFormat::OpenGLContextProfile profile); - - bool hasProfiles() const; - bool isLegacyVersion() const; - bool isValid() const; - -private: - QOpenGLVersionProfilePrivate* d; -}; - -inline uint qHash(const QOpenGLVersionProfile &v, uint seed = 0) -{ - return qHash(static_cast<int>(v.profile() * 1000) - + v.version().first * 100 + v.version().second * 10, seed); -} - -inline bool operator==(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs) -{ - if (lhs.profile() != rhs.profile()) - return false; - return lhs.version() == rhs.version(); -} - -inline bool operator!=(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs) -{ - return !operator==(lhs, rhs); -} - class Q_GUI_EXPORT QOpenGLContextGroup : public QObject { Q_OBJECT @@ -245,7 +198,6 @@ private: }; #ifndef QT_NO_DEBUG_STREAM -Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLVersionProfile &vp); Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLContext *ctx); Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLContextGroup *cg); #endif // !QT_NO_DEBUG_STREAM |