diff options
| author | Britney Fransen <brfransen@gmail.com> | 2015-02-19 18:16:16 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2015-02-19 18:16:16 (GMT) |
| commit | 8de064f6e96f960cdbfe6868d9957a4613f704df (patch) | |
| tree | 4e73a420991733450d013529c0fee60e0365297a /abs/core/qt4/moc-boost-workaround.patch | |
| parent | 0374b16f1e15ba1819b62bd5a6e0076ac7b243d0 (diff) | |
| parent | 6fde8cd5e74f0840e01988e743464fe91c0a28f8 (diff) | |
| download | linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.zip linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.tar.gz linhes_pkgbuild-8de064f6e96f960cdbfe6868d9957a4613f704df.tar.bz2 | |
Merge branch 'testing'
Diffstat (limited to 'abs/core/qt4/moc-boost-workaround.patch')
| -rw-r--r-- | abs/core/qt4/moc-boost-workaround.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/abs/core/qt4/moc-boost-workaround.patch b/abs/core/qt4/moc-boost-workaround.patch new file mode 100644 index 0000000..027f806 --- /dev/null +++ b/abs/core/qt4/moc-boost-workaround.patch @@ -0,0 +1,12 @@ +diff -upr qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp +--- qt-everywhere-opensource-src-4.8.6.orig/src/tools/moc/main.cpp 2014-04-10 21:37:12.000000000 +0300 ++++ qt-everywhere-opensource-src-4.8.6/src/tools/moc/main.cpp 2014-11-06 02:24:44.287305916 +0200 +@@ -190,6 +190,8 @@ int runMoc(int _argc, char **_argv) + + // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 + pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; ++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; ++ pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"]; + + QByteArray filename; + QByteArray output; |