mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-20 06:23:54 +00:00
Merge remote-tracking branch 'lgro/qt_and_boost_join_workaround'
This commit is contained in:
commit
ffb133c862
1 changed files with 2 additions and 2 deletions
|
@ -2,9 +2,9 @@
|
||||||
#define MAINDIALOG_H
|
#define MAINDIALOG_H
|
||||||
|
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
|
#ifndef Q_MOC_RUN
|
||||||
#include <components/files/configurationmanager.hpp>
|
#include <components/files/configurationmanager.hpp>
|
||||||
|
#endif
|
||||||
#include "settings/gamesettings.hpp"
|
#include "settings/gamesettings.hpp"
|
||||||
#include "settings/graphicssettings.hpp"
|
#include "settings/graphicssettings.hpp"
|
||||||
#include "settings/launchersettings.hpp"
|
#include "settings/launchersettings.hpp"
|
||||||
|
|
Loading…
Reference in a new issue