diff options
| author | Marius Kintel <marius@kintel.net> | 2013-04-24 06:00:04 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-04-24 06:00:04 (GMT) |
| commit | 5f10c9f9c0a9805567ea8f9b560c6e0b50126119 (patch) | |
| tree | 8869b03872b42ce1ffb1755958d05925f9f0bcb4 /src/parsersettings.cc | |
| parent | 3307deee9361883a5297fbcac7f5a1cb428ed40c (diff) | |
| parent | f0ee85e17d474ab9119f82ee6f802d4634743b12 (diff) | |
Merge branch 'master' into issue217
Diffstat (limited to 'src/parsersettings.cc')
| -rw-r--r-- | src/parsersettings.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/parsersettings.cc b/src/parsersettings.cc index a757ba1..8d82744 100644 --- a/src/parsersettings.cc +++ b/src/parsersettings.cc @@ -3,8 +3,9 @@ #include <boost/foreach.hpp> #include "boosty.h" #include <boost/algorithm/string.hpp> -#include <qglobal.h> // Needed for Q_ defines - move the offending code somewhere else +#ifdef __APPLE__ #include "CocoaUtils.h" +#endif namespace fs = boost::filesystem; |