Merge remote-tracking branch 'glorf/weather'

12 years ago · ef9abda754
parent 9fe5ff46cd 19ce233667
commit ef9abda754
1 changed files with 3 additions and 0 deletions
--- a/apps/opencs/view/settings/usersettingsdialog.hpp
+++ b/apps/opencs/view/settings/usersettingsdialog.hpp
@ -4,7 +4,10 @@
 #include <QMainWindow>
 #include <QStackedWidget>

+#ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
+#endif
+
 #include "../../model/settings/usersettings.hpp"
 #include "../../model/settings/support.hpp"