summaryrefslogtreecommitdiff
path: root/src/parsersettings.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-04-12 04:13:09 (GMT)
committerMarius Kintel <marius@kintel.net>2013-04-12 04:13:09 (GMT)
commit60a351a5ee593aee68716dfa76e9ee4f4b767e9f (patch)
tree374e7104bec631f64187010ba8c2521ba95a3fb7 /src/parsersettings.cc
parent6de88962556c5343f6b8db7fdfe4233c50ba2953 (diff)
parentf242a7a6934effdb292c0fedafa954bafc615cc3 (diff)
Merge branch 'noqt'
Diffstat (limited to 'src/parsersettings.cc')
-rw-r--r--src/parsersettings.cc3
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;
contact: Jan Huwald // Impressum