projects
/
qt4-x11.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
080ea7e
)
qt-everywhere-opensource-src-4.8.5-QTBUG-22829
author
Debian Qt/KDE Maintainers
<debian-qt-kde@lists.debian.org>
Sun, 14 Jul 2019 10:19:27 +0000
(11:19 +0100)
committer
Felix Geyer
<fgeyer@debian.org>
Sun, 14 Jul 2019 10:19:27 +0000
(11:19 +0100)
Gbp-Pq: Name qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
src/tools/moc/main.cpp
patch
|
blob
|
history
diff --git
a/src/tools/moc/main.cpp
b/src/tools/moc/main.cpp
index 147e3f5a79ccb54136541d29c6d2b9d7e31c3cab..cec43e86a4ba638dc784df1c83894629dff4c88d 100644
(file)
--- a/
src/tools/moc/main.cpp
+++ b/
src/tools/moc/main.cpp
@@
-188,8
+188,9
@@
int runMoc(int _argc, char **_argv)
pp.macros["Q_MOC_RUN"];
pp.macros["__cplusplus"];
- // Workaround a bug
while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
+ // Workaround a bug
s while parsing some boost headers. See QTBUG-22829
pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
QByteArray filename;
QByteArray output;