diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-06 12:28:25 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-14 16:22:48 +0000 |
commit | af495c2042b6c460580041fd0c39697c144e45f7 (patch) | |
tree | 5d9ffeea002a3b8bcbcfe3c5707059526dceeda6 /src/plugins/platforms/windows/qwindowsopengltester.h | |
parent | 1c4e2b02aaf573d9c6dd14e57b54a307c28423cd (diff) |
Windows: Use QVersionNumber in GPU driver version.
Remove custom class.
Task-number: QTBUG-43263
Change-Id: I3399f86bbbe287560917ccda00334e348ac7da4c
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsopengltester.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsopengltester.h | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/src/plugins/platforms/windows/qwindowsopengltester.h b/src/plugins/platforms/windows/qwindowsopengltester.h index 59091c3ccd..f58bf305fc 100644 --- a/src/plugins/platforms/windows/qwindowsopengltester.h +++ b/src/plugins/platforms/windows/qwindowsopengltester.h @@ -38,39 +38,13 @@ #include <QtCore/QByteArray> #include <QtCore/QFlags> +#include <private/qversionnumber_p.h> QT_BEGIN_NAMESPACE class QDebug; class QVariant; -struct GpuDriverVersion // ### fixme: Use QVersionNumber in Qt 5.5? -{ - GpuDriverVersion(int p = 0, int v = 0, int sv =0, int b = 0) : product(p), version(v), subVersion(sv), build(b) {} - QString toString() const; - int compare(const GpuDriverVersion &rhs) const; - - int product; - int version; - int subVersion; - int build; -}; - -inline bool operator==(const GpuDriverVersion &v1, const GpuDriverVersion &v2) - { return !v1.compare(v2); } -inline bool operator!=(const GpuDriverVersion &v1, const GpuDriverVersion &v2) - { return v1.compare(v2); } -inline bool operator< (const GpuDriverVersion &v1, const GpuDriverVersion &v2) - { return v1.compare(v2) < 0; } -inline bool operator<=(const GpuDriverVersion &v1, const GpuDriverVersion &v2) - { return v1.compare(v2) <= 0; } -inline bool operator> (const GpuDriverVersion &v1, const GpuDriverVersion &v2) - { return v1.compare(v2) > 0; } -inline bool operator>=(const GpuDriverVersion &v1, const GpuDriverVersion &v2) - { return v1.compare(v2) >= 0; } - -QDebug operator<<(QDebug d, const GpuDriverVersion &gd); - struct GpuDescription { GpuDescription() : vendorId(0), deviceId(0), revision(0), subSysId(0) {} @@ -83,7 +57,7 @@ struct GpuDescription int deviceId; int revision; int subSysId; - GpuDriverVersion driverVersion; + QVersionNumber driverVersion; QByteArray driverName; QByteArray description; }; |