diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 01:01:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-16 01:01:30 +0100 |
| commit | 11b9c813e6705b0349e4c241f9132a6649977431 (patch) | |
| tree | 69df65cb06c9617ab305a55be413a6be63677913 /src/plugins/platforms/windows/qwindowsopengltester.h | |
| parent | 8cc8eb8f24b9d297a25c9841326c6fa8561cf80e (diff) | |
| parent | 4554fa7b191566df0a6c07e686c642c78eb88095 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ief0a0b754c104d5348fee9ee15e967bd37c526f8
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsopengltester.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsopengltester.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsopengltester.h b/src/plugins/platforms/windows/qwindowsopengltester.h index 08628c2586..9576dfbae0 100644 --- a/src/plugins/platforms/windows/qwindowsopengltester.h +++ b/src/plugins/platforms/windows/qwindowsopengltester.h @@ -42,6 +42,7 @@ #include <QtCore/qbytearray.h> #include <QtCore/qflags.h> +#include <QtCore/qvector.h> #include <QtCore/qversionnumber.h> QT_BEGIN_NAMESPACE @@ -52,6 +53,7 @@ class QVariant; struct GpuDescription { static GpuDescription detect(); + static QVector<GpuDescription> detectAll(); QString toString() const; QVariant toVariant() const; |