From 10f6b73cad8f98496da9c4eaa3be04b49b0c8495 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 18 Apr 2019 20:56:44 -0700 Subject: [PATCH] Revert "Avoid using ANGLE on debug builds due to assert issues on Qt 5.12.2" Qt 5.12.3 fixes the bug. https://bugreports.qt.io/browse/QTBUG-74467 This reverts commit 26bdc3e1d5aa2fd394e7e69779068c81d1e82dcc. --- app/main.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/main.cpp b/app/main.cpp index c7a796d6..e9b1b156 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -290,10 +290,7 @@ int main(int argc, char *argv[]) // password prompts on macOS. qputenv("QT_SSL_USE_TEMPORARY_KEYCHAIN", "1"); - // The debug build of ANGLE on Qt 5.12.2 triggers all sorts of asserts - // even simply creating an empty Qt Quick window and then trying to close - // the program. Avoid using ANGLE for debug builds until the issue is fixed. -#if defined(Q_OS_WIN32) && !defined(QT_DEBUG) +#ifdef Q_OS_WIN32 if (!qEnvironmentVariableIsSet("QT_OPENGL")) { // On Windows, use ANGLE so we don't have to load OpenGL // user-mode drivers into our app. OGL drivers (especially Intel)