summaryrefslogtreecommitdiffstats
path: root/abs/core/qt4/moc-boost-workaround.patch
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2014-12-04 21:23:57 (GMT)
committerBritney Fransen <brfransen@gmail.com>2014-12-04 21:23:57 (GMT)
commit167e1d1b4b9a7a188b14d2e3e818d8fd6f9707aa (patch)
tree818363d145684055677599f269942ae39a68e496 /abs/core/qt4/moc-boost-workaround.patch
parentdddcec05d0ea1abdeea08525e4a4c16efcc16295 (diff)
downloadlinhes_pkgbuild-167e1d1b4b9a7a188b14d2e3e818d8fd6f9707aa.zip
linhes_pkgbuild-167e1d1b4b9a7a188b14d2e3e818d8fd6f9707aa.tar.gz
linhes_pkgbuild-167e1d1b4b9a7a188b14d2e3e818d8fd6f9707aa.tar.bz2
qt4: update to 4.8.6
rename qt to qt4 to get ready for qt5
Diffstat (limited to 'abs/core/qt4/moc-boost-workaround.patch')
-rw-r--r--abs/core/qt4/moc-boost-workaround.patch12
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;