diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-06-22 18:54:16 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-23 04:08:41 +0000 |
| commit | d40647922b1b8542d36fd3a2496740d6e66343c7 (patch) | |
| tree | 04f1febd6a3d9fdb4018006745e56b3f6e43795d /src/gui/opengl/qopengl.cpp | |
| parent | 9e139ce0993f11115639426982873becdd87cc10 (diff) | |
Revert "windows: Disable D3D9/11 with ANGLE in VMs"
This reverts commit a6000e2b6679d91c9dab44e49b485de6816372bc.
Temporarily remove this to unblock the qtdeclarative dev CI.
While Windows 8 VMs are fixed by this patch, Windows 7 has different
problems.
Change-Id: I45ef064ed953cc4b7bbf19657300d4fc43d82452
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/gui/opengl/qopengl.cpp')
| -rw-r--r-- | src/gui/opengl/qopengl.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp index 5c16e79e6f7..1c008ccb42c 100644 --- a/src/gui/opengl/qopengl.cpp +++ b/src/gui/opengl/qopengl.cpp @@ -141,7 +141,6 @@ static inline QString vendorIdKey() { return QStringLiteral("vendor_id"); } static inline QString glVendorKey() { return QStringLiteral("gl_vendor"); } static inline QString deviceIdKey() { return QStringLiteral("device_id"); } static inline QString driverVersionKey() { return QStringLiteral("driver_version"); } -static inline QString driverDescriptionKey() { return QStringLiteral("driver_description"); } static inline QString featuresKey() { return QStringLiteral("features"); } static inline QString idKey() { return QStringLiteral("id"); } static inline QString descriptionKey() { return QStringLiteral("description"); } @@ -337,15 +336,6 @@ static bool matches(const QJsonObject &object, QLatin1String("Driver version must be of type object.")); } } - - if (!gpu.driverDescription.isEmpty()) { - const QJsonValue driverDescriptionV = object.value(driverDescriptionKey()); - if (driverDescriptionV.isString()) { - if (!gpu.driverDescription.contains(driverDescriptionV.toString().toUtf8())) - return false; - } - } - return true; } |