diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-03-16 20:56:01 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-03-16 20:56:01 (GMT) |
| commit | c855e4d0436a01792b540c7857e1a1997f4810d7 (patch) | |
| tree | 4af96b1e682ed36543986d844d0430abedc10365 /src/parsersettings.cc | |
| parent | 5edc8c57da6eb8bfb7725ac51c4b87edd950e847 (diff) | |
| parent | 5628a18f6a0fcf2dd170cac31e386f1ad4f97c0c (diff) | |
Merge branch 'noqt' of ssh://ssh.github.com:443/openscad/openscad into noqt_tweaks
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; |