summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2019-06-13 09:42:10 +0300
committerAntti Määttä <antti.maatta@qt.io>2019-06-13 09:42:10 +0300
commit593c4d6238d8dfd2d2802b158d4a910a99c4cea7 (patch)
treeaa9238061656904ad6dcfd8194f5afc257468861
parentefbec780a5188badb9165324df2a393c3b36f27a (diff)
Remove Qt3DSAssert from studioapp
This makes the submodule update to work. Change-Id: I2ba392d62a0120dbf491df89a6670c4bff792c26 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Authoring/Qt3DStudio/Application/StudioApp.cpp11
1 files changed, 0 insertions, 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