diff --git a/all.h b/all.h index 261b2b42f725e..dc52e2b0baa76 100644 --- a/all.h +++ b/all.h @@ -162,5 +162,16 @@ #include #include #include + + +// 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 0a3e89eea8b22..98444d7d007fc 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); }