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:
951e410
)
qt-everywhere-opensource-src-4.8.5-QTBUG-22829
author
Debian Qt/KDE Maintainers
<debian-qt-kde@lists.debian.org>
Tue, 7 May 2019 07:14:21 +0000
(08:14 +0100)
committer
Mike Gabriel
<sunweaver@debian.org>
Tue, 7 May 2019 07:14:21 +0000
(08:14 +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 a2211af5c1c0e610e5ad12b3fa43212f78049bc3..f0c5a53c8ff3d719b075272b6b08db43a57dac97 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;