OSDN Git Service

apply upstream commits
authorIvailo Monev <xakepa10@laimg.moc>
Sun, 5 May 2019 05:12:16 +0000 (05:12 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Sun, 5 May 2019 05:12:21 +0000 (05:12 +0000)
commita133aaf3a841f451a277587cccf578fc624a6054
tree5ff07f9b5477048ed4a43883cc6a5631c5f135cd
parent8db0d36301c3e90c35091a93874ed3b44d92ed60
apply upstream commits
 https://github.com/qt/qtbase/commit/c619fc278d7e5acd8f0ae8f9e2013f351c50c355
 and
 https://github.com/qt/qtbase/commit/4dcd9145e74dfb8c59016cf0011987cdeb6b3576

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/tools/moc/generator.cpp
src/tools/moc/moc.cpp