summaryrefslogtreecommitdiff
path: root/src/parsersettings.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-04-10 18:28:51 (GMT)
committerMarius Kintel <marius@kintel.net>2013-04-10 18:28:51 (GMT)
commit49a288cd34f604ed13e1eff7b48bcfc6d6286169 (patch)
tree0ca95d4bfba42e4dc89f1b6f770a34bc6977a4af /src/parsersettings.cc
parentfd9dd04f5064a9a21f593670fdcc073fdc14dbfc (diff)
parentd545a227260ddd72b1fdb5c3dc2ebb1bae36c410 (diff)
Merge branch 'noqt' into testing
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