diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
| commit | eefcd6d0b271642d470cd55bc47d1579d943938e (patch) | |
| tree | 48f9e4db455879025adb9317b740bfa4b72c2d66 /src/value.h | |
| parent | f70578f362c8c2c78036c9de846c20802ac7aa81 (diff) | |
| parent | beff2b1f4811b7f9d2b58bfc6a469a363bc9bfd0 (diff) | |
Merge branch 'master' into epec-kernel
Conflicts:
src/PolySetCGALEvaluator.cc
Diffstat (limited to 'src/value.h')
| -rw-r--r-- | src/value.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/value.h b/src/value.h index 24fbf49..0445ff4 100644 --- a/src/value.h +++ b/src/value.h @@ -3,8 +3,12 @@ #include <vector> #include <string> + +// Workaround for https://bugreports.qt-project.org/browse/QTBUG-22829 +#ifndef Q_MOC_RUN #include <boost/variant.hpp> #include <boost/lexical_cast.hpp> +#endif class QuotedString : public std::string { |