fix compiling for qt5.5

Jojo-Schmitz · Jul 8, 2015 · fc8fad9 · fc8fad9
1 parent 57deb72
commit fc8fad9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git 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
@@ -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);
       }