From d40647922b1b8542d36fd3a2496740d6e66343c7 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 22 Jun 2015 18:54:16 +0200 Subject: 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 --- src/gui/opengl/qopengl.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/gui/opengl/qopengl.cpp') 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; } -- cgit v1.2.3