Sfoglia il codice sorgente

Merge branch '482-fix-ctkTestApplication-qt4-build'

* 482-fix-ctkTestApplication-qt4-build:
  Fix build of ctkTestApplication.cpp with Qt4. Fixes #482
Jean-Christophe Fillion-Robin 11 anni fa
parent
commit
383c477dc3
1 ha cambiato i file con 4 aggiunte e 2 eliminazioni
  1. 4 2
      Libs/Widgets/ctkTestApplication.cpp

+ 4 - 2
Libs/Widgets/ctkTestApplication.cpp

@@ -119,10 +119,12 @@ int ctkTestApplication::exec(bool reportErrorsOnExit)
 //-----------------------------------------------------------------------------
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 void ctkTestApplication::messageHandler(QtMsgType type, const QMessageLogContext& /*context*/, const QString& msg)
+{
 #else
-void ctkTestApplication::messageHandler(QtMsgType type, const char *msg)
-#endif
+void ctkTestApplication::messageHandler(QtMsgType type, const char *msgAsStr)
 {
+  QString msg(msgAsStr);
+#endif
   switch(type)
   {
   case QtDebugMsg: