From fc8fad97be6e760fac90925fd5d5e587b5975606 Mon Sep 17 00:00:00 2001
From: ws <ws@wschweer.de>
Date: Wed, 8 Jul 2015 14:39:33 +0200
Subject: [PATCH] fix compiling for qt5.5
---
all.h | 11 +++++++++++
mscore/pluginCreator.cpp | 8 +++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/all.h b/all.h
index 261b2b4..dc52e2b 100644
--- a/all.h
+++ b/all.h
@@ -162,5 +162,16 @@
#include <QWidgetAction>
#include <QHelpIndexModel>
#include <QTextBrowser>
+
+
+// change Q_ASSERT to NOP if not debugging
+
+#ifdef QT_NO_DEBUG
+#undef Q_ASSERT_X
+#define Q_ASSERT_X(a,b,c)
+#undef Q_ASSERT
+#define Q_ASSERT(a)
+#endif
+
#endif
diff --git a/mscore/pluginCreator.cpp b/mscore/pluginCreator.cpp
index 0a3e89e..98444d7 100644
--- a/mscore/pluginCreator.cpp
+++ b/mscore/pluginCreator.cpp
@@ -263,10 +263,12 @@ static void qmlMsgHandler(QtMsgType type, const char* msg)
case QtFatalMsg:
s = QString("Fatal: %1\n").arg(msg);
break;
-/* Qt5.2? case QtTraceMsg:
- s = QString("Trace: %1\n").arg(msg);
+ default:
+
+// Qt5.2? case QtTraceMsg:
+// Qt5.4 case QtInfoMsg:
+ s = QString("Info: %1\n").arg(msg);
break;
- */
}
mscore->pluginCreator()->msg(s);
}