From f6f2900e5886d00fac0883a735ce7d8a1787935d Mon Sep 17 00:00:00 2001
From: Jens Olav Nygaard <Jens.O.Nygaard@sintef.no>
Date: Mon, 1 Aug 2016 16:12:29 +0200
Subject: [PATCH] Added wrapping of all boost headers until the whole beast
 built successfully...

---
 include/tinia/jobcontroller/ComputeJob.hpp              | 3 +++
 include/tinia/model/ExposedModelLock.hpp                | 6 ++++++
 include/tinia/model/StateSchemaElement.hpp              | 3 +++
 include/tinia/model/impl/utils.hpp                      | 3 +++
 include/tinia/model/impl/xml/ElementHandler.hpp         | 3 +++
 include/tinia/qtcontroller/QTController.hpp             | 3 +++
 include/tinia/qtcontroller/impl/http_utils.hpp          | 3 +++
 include/tinia/qtcontroller/moc/Canvas.hpp               | 3 +++
 include/tinia/qtcontroller/moc/VisibilityController.hpp | 3 +++
 include/tinia/qtcontroller/scripting/ExposedModel.hpp   | 3 +++
 include/tinia/renderlist/Item.hpp                       | 3 +++
 include/tinia/renderlist/gl/Renderer.hpp                | 3 +++
 src/model/ElementData.cpp                               | 3 +++
 src/model/ExposedModel.cpp                              | 3 +++
 src/model/validateGUI.cpp                               | 3 +++
 src/modelxml/XMLBuilder.cpp                             | 3 +++
 src/modelxml/XMLReader.cpp                              | 3 +++
 src/modelxml/XMLTransporter.cpp                         | 3 +++
 src/qtcontroller/HTTPServer.cpp                         | 3 +++
 src/qtcontroller/HorizontalSlider.cpp                   | 3 +++
 unittests/ipc/main.cpp                                  | 3 +++
 unittests/ipc/test_errors.cpp                           | 3 +++
 unittests/ipc/test_fixture.hpp                          | 3 +++
 unittests/ipc/test_notification.cpp                     | 3 +++
 unittests/ipc/test_sendrecv.cpp                         | 3 +++
 unittests/modelxml/ExposedModelTest.cpp                 | 9 +++++++++
 unittests/modelxml/main.cpp                             | 3 +++
 unittests/qtcontroller/EventHandler.cpp                 | 6 ++++++
 unittests/qtcontroller/ScriptEngine.cpp                 | 3 +++
 unittests/qtcontroller/Server.cpp                       | 3 +++
 unittests/qtcontroller/main.cpp                         | 3 +++
 31 files changed, 105 insertions(+)

diff --git a/include/tinia/jobcontroller/ComputeJob.hpp b/include/tinia/jobcontroller/ComputeJob.hpp
index 02afd59..23a5353 100644
--- a/include/tinia/jobcontroller/ComputeJob.hpp
+++ b/include/tinia/jobcontroller/ComputeJob.hpp
@@ -20,8 +20,11 @@
 #include <string>
 //#include <mutex> 
 #include "tinia/jobcontroller/Job.hpp"
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/thread/thread.hpp>
 #include <boost/scoped_ptr.hpp>
+#endif
 
 namespace tinia {
 namespace jobcontroller
diff --git a/include/tinia/model/ExposedModelLock.hpp b/include/tinia/model/ExposedModelLock.hpp
index db148dd..a52c977 100644
--- a/include/tinia/model/ExposedModelLock.hpp
+++ b/include/tinia/model/ExposedModelLock.hpp
@@ -17,9 +17,15 @@
  */
 
 #pragma once
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include "boost/thread.hpp"
+#endif
 #include "tinia/model/ExposedModel.hpp"
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/shared_ptr.hpp>
+#endif
 
 namespace tinia {
 namespace model {
diff --git a/include/tinia/model/StateSchemaElement.hpp b/include/tinia/model/StateSchemaElement.hpp
index c871c41..c7b7598 100644
--- a/include/tinia/model/StateSchemaElement.hpp
+++ b/include/tinia/model/StateSchemaElement.hpp
@@ -18,7 +18,10 @@
 
 #pragma once
 #include "tinia/model/impl/ElementData.hpp"
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/property_tree/ptree.hpp>
+#endif
 #include <string>
 
 namespace tinia {
diff --git a/include/tinia/model/impl/utils.hpp b/include/tinia/model/impl/utils.hpp
index 7f30f00..7ca7d90 100644
--- a/include/tinia/model/impl/utils.hpp
+++ b/include/tinia/model/impl/utils.hpp
@@ -20,8 +20,11 @@
 
 #include <string>
 #include <stdexcept>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
 #include <boost/property_tree/ptree.hpp>
+#endif
 #include <iostream>
 
 
diff --git a/include/tinia/model/impl/xml/ElementHandler.hpp b/include/tinia/model/impl/xml/ElementHandler.hpp
index 4041b7d..39044ea 100644
--- a/include/tinia/model/impl/xml/ElementHandler.hpp
+++ b/include/tinia/model/impl/xml/ElementHandler.hpp
@@ -18,7 +18,10 @@
 
 #pragma once
 #include <string>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/shared_ptr.hpp>
+#endif
 #include "tinia/model/ExposedModel.hpp"
 
 namespace tinia {
diff --git a/include/tinia/qtcontroller/QTController.hpp b/include/tinia/qtcontroller/QTController.hpp
index dd5460e..a488fec 100644
--- a/include/tinia/qtcontroller/QTController.hpp
+++ b/include/tinia/qtcontroller/QTController.hpp
@@ -22,8 +22,11 @@
 
 
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
+#endif
 
 class QMainWindow;
 class QGLWidget;
diff --git a/include/tinia/qtcontroller/impl/http_utils.hpp b/include/tinia/qtcontroller/impl/http_utils.hpp
index d48dfd1..8543c32 100644
--- a/include/tinia/qtcontroller/impl/http_utils.hpp
+++ b/include/tinia/qtcontroller/impl/http_utils.hpp
@@ -4,10 +4,13 @@
 #include <QStringList>
 #include <QMap>
 #include <stdexcept>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
 #include <boost/fusion/sequence.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
 #include <boost/tuple/tuple_io.hpp>
+#endif
 
 namespace tinia { namespace qtcontroller { namespace impl {
 
diff --git a/include/tinia/qtcontroller/moc/Canvas.hpp b/include/tinia/qtcontroller/moc/Canvas.hpp
index a0f18f3..4cfd2b6 100644
--- a/include/tinia/qtcontroller/moc/Canvas.hpp
+++ b/include/tinia/qtcontroller/moc/Canvas.hpp
@@ -27,7 +27,10 @@
 #include "tinia/model/ExposedModel.hpp"
 #include "tinia/model/StateListener.hpp"
 #include <tinia/qtcontroller/impl/EventHandler.hpp>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/scoped_ptr.hpp>
+#endif
 
 namespace tinia {
 namespace qtcontroller {
diff --git a/include/tinia/qtcontroller/moc/VisibilityController.hpp b/include/tinia/qtcontroller/moc/VisibilityController.hpp
index 6db9b1a..9cfcb0f 100644
--- a/include/tinia/qtcontroller/moc/VisibilityController.hpp
+++ b/include/tinia/qtcontroller/moc/VisibilityController.hpp
@@ -21,7 +21,10 @@
 #include <QObject>
 #include <QWidget>
 #include <string>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/shared_ptr.hpp>
+#endif
 #include "tinia/model/ExposedModel.hpp"
 #include "tinia/model/StateListener.hpp"
 
diff --git a/include/tinia/qtcontroller/scripting/ExposedModel.hpp b/include/tinia/qtcontroller/scripting/ExposedModel.hpp
index 1fde014..0a93aea 100644
--- a/include/tinia/qtcontroller/scripting/ExposedModel.hpp
+++ b/include/tinia/qtcontroller/scripting/ExposedModel.hpp
@@ -18,7 +18,10 @@
 
 #pragma once
 #include <QObject>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/shared_ptr.hpp>
+#endif
 #include <tinia/model/ExposedModel.hpp>
 #include <tinia/qtcontroller/scripting/Viewer.hpp>
 #include <QtScript>
diff --git a/include/tinia/renderlist/Item.hpp b/include/tinia/renderlist/Item.hpp
index 4eb5358..b609dc4 100644
--- a/include/tinia/renderlist/Item.hpp
+++ b/include/tinia/renderlist/Item.hpp
@@ -17,7 +17,10 @@
  */
 
 #pragma once
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/utility.hpp>
+#endif
 #include <tinia/renderlist/RenderList.hpp>
 
 namespace tinia {
diff --git a/include/tinia/renderlist/gl/Renderer.hpp b/include/tinia/renderlist/gl/Renderer.hpp
index a098e15..e90e98a 100644
--- a/include/tinia/renderlist/gl/Renderer.hpp
+++ b/include/tinia/renderlist/gl/Renderer.hpp
@@ -19,7 +19,10 @@
 #pragma once
 #include <list>
 #include <map>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/utility.hpp>
+#endif
 #include <tinia/renderlist/RenderList.hpp>
 
 namespace tinia {
diff --git a/src/model/ElementData.cpp b/src/model/ElementData.cpp
index 5ca2543..5272af6 100644
--- a/src/model/ElementData.cpp
+++ b/src/model/ElementData.cpp
@@ -21,8 +21,11 @@
 #include <iostream>
 #include <string>
 #include <vector>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/algorithm/string.hpp>
+#endif
 #include <tinia/model/exceptions/RestrictionException.hpp>
 
 using std::cout;
diff --git a/src/model/ExposedModel.cpp b/src/model/ExposedModel.cpp
index 1e2e3f8..d4abfb1 100644
--- a/src/model/ExposedModel.cpp
+++ b/src/model/ExposedModel.cpp
@@ -28,8 +28,11 @@
 #include <map>
 #include <iterator>
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
+#endif
 
 #include "tinia/model/Viewer.hpp"
 
diff --git a/src/model/validateGUI.cpp b/src/model/validateGUI.cpp
index 29cb1c6..285fc25 100644
--- a/src/model/validateGUI.cpp
+++ b/src/model/validateGUI.cpp
@@ -18,9 +18,12 @@
 
 
 #include <tinia/model/GUILayout.hpp>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/for_each.hpp>
 #include <boost/mpl/placeholders.hpp>
+#endif
 #include <tinia/model/GUILayout.hpp>
 #include <tinia/model/ExposedModel.hpp>
 #include <tinia/model/exceptions/KeyNotFoundException.hpp>
diff --git a/src/modelxml/XMLBuilder.cpp b/src/modelxml/XMLBuilder.cpp
index b21afd1..b70365a 100644
--- a/src/modelxml/XMLBuilder.cpp
+++ b/src/modelxml/XMLBuilder.cpp
@@ -20,8 +20,11 @@
 
 #include <iostream>
 #include <algorithm>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/lexical_cast.hpp>
+#endif
 
 using namespace std;
 
diff --git a/src/modelxml/XMLReader.cpp b/src/modelxml/XMLReader.cpp
index 05d3516..e1698fa 100644
--- a/src/modelxml/XMLReader.cpp
+++ b/src/modelxml/XMLReader.cpp
@@ -20,8 +20,11 @@
 //#include "tinia/model/ExposedModel.hpp"
 #include "tinia/model/impl/xml/utils.hpp"
 #include <algorithm>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
 #include <boost/property_tree/ptree.hpp>
+#endif
 
 #define XMLDEBUG std::cout<< __FILE__<<__LINE__ << std::endl;
 
diff --git a/src/modelxml/XMLTransporter.cpp b/src/modelxml/XMLTransporter.cpp
index db8bfd7..e57be7a 100644
--- a/src/modelxml/XMLTransporter.cpp
+++ b/src/modelxml/XMLTransporter.cpp
@@ -17,7 +17,10 @@
  */
 
 #include <algorithm>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
+#endif
 #include <iostream>
 #include <cstring>
 #include <stdexcept>
diff --git a/src/qtcontroller/HTTPServer.cpp b/src/qtcontroller/HTTPServer.cpp
index 1cbc2e8..15115df 100644
--- a/src/qtcontroller/HTTPServer.cpp
+++ b/src/qtcontroller/HTTPServer.cpp
@@ -30,9 +30,12 @@
 #include <QStringList>
 #include <QDateTime>
 #include <QFile>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
 #include <boost/tuple/tuple_io.hpp>
+#endif
 #include <QThreadPool>
 
 namespace tinia {
diff --git a/src/qtcontroller/HorizontalSlider.cpp b/src/qtcontroller/HorizontalSlider.cpp
index f7e9fce..cc0ef82 100644
--- a/src/qtcontroller/HorizontalSlider.cpp
+++ b/src/qtcontroller/HorizontalSlider.cpp
@@ -18,7 +18,10 @@
 
 #include "tinia/qtcontroller/moc/HorizontalSlider.hpp"
 #include <QHBoxLayout>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/lexical_cast.hpp>
+#endif
 
 namespace tinia {
 namespace qtcontroller {
diff --git a/unittests/ipc/main.cpp b/unittests/ipc/main.cpp
index 27e4137..734b037 100644
--- a/unittests/ipc/main.cpp
+++ b/unittests/ipc/main.cpp
@@ -16,5 +16,8 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define BOOST_TEST_MODULE IpcMsgTest
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 
diff --git a/unittests/ipc/test_errors.cpp b/unittests/ipc/test_errors.cpp
index 2e4eb41..6f7f928 100644
--- a/unittests/ipc/test_errors.cpp
+++ b/unittests/ipc/test_errors.cpp
@@ -15,7 +15,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include "test_fixture.hpp"
 
 BOOST_AUTO_TEST_SUITE( IpcMsgErrors )
diff --git a/unittests/ipc/test_fixture.hpp b/unittests/ipc/test_fixture.hpp
index 32f56a1..4528b34 100644
--- a/unittests/ipc/test_fixture.hpp
+++ b/unittests/ipc/test_fixture.hpp
@@ -21,7 +21,10 @@
 #include <iostream>
 #include <sstream>
 #include <sys/time.h>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include <tinia/ipc/ipc_msg.h>
 #include "../../src/ipc/ipc_msg_internal.h"
 #ifdef TINIA_IPC_VALGRIND_ANNOTATIONS
diff --git a/unittests/ipc/test_notification.cpp b/unittests/ipc/test_notification.cpp
index 084667b..f59593b 100644
--- a/unittests/ipc/test_notification.cpp
+++ b/unittests/ipc/test_notification.cpp
@@ -15,7 +15,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include "test_fixture.hpp"
 
 BOOST_AUTO_TEST_SUITE( IpcMsgNotification )
diff --git a/unittests/ipc/test_sendrecv.cpp b/unittests/ipc/test_sendrecv.cpp
index ac4eccc..199c68e 100644
--- a/unittests/ipc/test_sendrecv.cpp
+++ b/unittests/ipc/test_sendrecv.cpp
@@ -15,7 +15,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include "test_fixture.hpp"
 
 BOOST_AUTO_TEST_SUITE( IpcMsgSendRecv )
diff --git a/unittests/modelxml/ExposedModelTest.cpp b/unittests/modelxml/ExposedModelTest.cpp
index 87909db..a550061 100644
--- a/unittests/modelxml/ExposedModelTest.cpp
+++ b/unittests/modelxml/ExposedModelTest.cpp
@@ -16,13 +16,19 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 
 #include <string>
 #include <memory>
 #include <stdexcept>
 #include <iostream>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/array.hpp>
+#endif
 #include <vector>
 #include <ctime>
 #include <cstring>
@@ -43,7 +49,10 @@
 
 #include "testutils.hpp"
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/algorithm/string.hpp>
+#endif
 
 using tinia::model::impl::ElementData;
 using tinia::model::impl::xml::xpathQuery;
diff --git a/unittests/modelxml/main.cpp b/unittests/modelxml/main.cpp
index 74559da..ff04b06 100644
--- a/unittests/modelxml/main.cpp
+++ b/unittests/modelxml/main.cpp
@@ -17,4 +17,7 @@
  */
 
 #define BOOST_TEST_MODULE ExposedModelTest
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
diff --git a/unittests/qtcontroller/EventHandler.cpp b/unittests/qtcontroller/EventHandler.cpp
index cd628ee..6977c9b 100644
--- a/unittests/qtcontroller/EventHandler.cpp
+++ b/unittests/qtcontroller/EventHandler.cpp
@@ -16,11 +16,17 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include <tinia/qtcontroller/impl/EventHandler.hpp>
 #include <tinia/qtcontroller/impl/ScriptEngine.hpp>
 #include <tinia/qtcontroller/scripting/KeyboardEvent.hpp>
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/make_shared.hpp>
+#endif
 
 BOOST_AUTO_TEST_SUITE(EventHandler)
 
diff --git a/unittests/qtcontroller/ScriptEngine.cpp b/unittests/qtcontroller/ScriptEngine.cpp
index 21f2437..11553ff 100644
--- a/unittests/qtcontroller/ScriptEngine.cpp
+++ b/unittests/qtcontroller/ScriptEngine.cpp
@@ -16,7 +16,10 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include <tinia/qtcontroller/impl/ScriptEngine.hpp>
 
 BOOST_AUTO_TEST_SUITE(ScriptEngine)
diff --git a/unittests/qtcontroller/Server.cpp b/unittests/qtcontroller/Server.cpp
index a7322a8..a0c1309 100644
--- a/unittests/qtcontroller/Server.cpp
+++ b/unittests/qtcontroller/Server.cpp
@@ -16,7 +16,10 @@
  * along with the Tinia Framework.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include "tinia/qtcontroller/impl/http_utils.hpp"
 #include <QString>
 
diff --git a/unittests/qtcontroller/main.cpp b/unittests/qtcontroller/main.cpp
index cd1fe4b..dbdb5f2 100644
--- a/unittests/qtcontroller/main.cpp
+++ b/unittests/qtcontroller/main.cpp
@@ -17,7 +17,10 @@
  */
 
 #define BOOST_TEST_MODULE qtcontrollerTest
+// QT's moc doesn't like BOOST_JOIN ( can be removed in QT 5.0 we think)
+#ifndef Q_MOC_RUN 
 #include <boost/test/unit_test.hpp>
+#endif
 #include <QApplication>
 
 /*