Merge branch 'compile-with-5.6' into 'master'

Compile with 5.6. Contributes to JB#35409.



See merge request !21

src/main.cpp

@@ -82,6 +82,9 @@ void messageHandler(QtMsgType type, const QMessageLogContext &, const QString &m
     case QtFatalMsg:
         logLevel = "FATAL: ";
         priority = LOG_ALERT;
+        break;
+    default:
+        break;
     }
 
     const QByteArray &msgData(message.toLocal8Bit());

src/src.pro

@@ -114,7 +114,7 @@ EXTENSIONS_DIR = $$IN_PWD/TpExtensions
 EXTENSIONS_GENERATED_DIR = $$EXTENSIONS_DIR/.gen
 TOOLS_DIR = $$IN_PWD/../tools
 PYTHON = $$TOOLS_DIR/python.sh 2.6
-MOC = moc
+MOC = $$TOOLS_DIR/mocwrapper.sh
 
 XINCLUDATOR = $$TOOLS_DIR/xincludator.py
 CONSTANTS_GEN = $$TOOLS_DIR/qt4-constants-gen.py

tools/mocwrapper.sh

@@ -0,0 +1,11 @@
+ARGS=
+for i
+do
+    if [ "$1" == "-isystem" ]; then
+        ARGS="$ARGS -I"
+    else
+        ARGS="$ARGS $i"
+    fi
+    shift
+done
+moc $ARGS