diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-24 14:16:20 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-24 14:16:20 (GMT) |
| commit | 26046f6f0c4a774cbbb2af8ae7dc0e687963440c (patch) | |
| tree | 38ff04fc460e8aa55134fb1ee6167fafb90a3423 /src/parsersettings.cc | |
| parent | eefcd6d0b271642d470cd55bc47d1579d943938e (diff) | |
| parent | 95e399e06c6522f3fa67679808a1d52815368efa (diff) | |
Merge branch 'master' into epec-kernel
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; |