Merge remote-tracking branch 'lgro/qt_and_boost_join_workaround'

12 years ago · ffb133c862
parent 676a92e2e0 98727d2fb6
commit ffb133c862
1 changed files with 2 additions and 2 deletions
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@ -2,9 +2,9 @@
 #define MAINDIALOG_H

 #include <QMainWindow>
-
+#ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
-
+#endif
 #include "settings/gamesettings.hpp"
 #include "settings/graphicssettings.hpp"
 #include "settings/launchersettings.hpp"