From 593c4d6238d8dfd2d2802b158d4a910a99c4cea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= Date: Thu, 13 Jun 2019 09:42:10 +0300 Subject: Remove Qt3DSAssert from studioapp This makes the submodule update to work. Change-Id: I2ba392d62a0120dbf491df89a6670c4bff792c26 Reviewed-by: Miikka Heikkinen --- src/Authoring/Qt3DStudio/Application/StudioApp.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/Authoring/Qt3DStudio/Application/StudioApp.cpp b/src/Authoring/Qt3DStudio/Application/StudioApp.cpp index 6e2ca19a..e29c0fbe 100644 --- a/src/Authoring/Qt3DStudio/Application/StudioApp.cpp +++ b/src/Authoring/Qt3DStudio/Application/StudioApp.cpp @@ -214,17 +214,6 @@ CStudioApp g_StudioApp; using namespace Q3DStudio; -namespace qt3ds -{ -void Qt3DSAssert(const char *exp, const char *file, int line, bool *ignore) -{ - Q_UNUSED(ignore) - g_StudioApp.GetDialogs()->DestroyProgressScreen(); - g_StudioApp.GetDialogs()->DisplayKnownErrorDialog(exp); - qFatal("Assertion thrown %s(%d): %s", file, line, exp); -} -} - //============================================================================= /** * Constructor -- cgit v1.2.3