[Development] Problem with merging a patch

[Daniel Savi]

Dear developers
My journey into Qt development came again to a sudden halt. I've 
commited this patch (Iaa8ec0246aaba004d98c9e8c66609795101519a9) and Lars 
Knoll gave it green light after comments from him, André Hartman and 
Edward Welbourne.
Now, when I hit the "Merge patch Set to Staging"-button, I'm getting 
this message:

Code Review - Error
Your change could not be merged due to a path conflict. Make sure you 
staged all dependencies of this change. If the change has dependencies 
which are currently INTEGRATING, try again when the integration 
finishes. Otherwise please rebase the change locally and upload the 
rebased commit for review.

I thought that my local history looks pretty clean. "git log --oneline" 
gives me this:
2702f9d3fe Add image quality handling to QTextImageFormat
36385fb2fa Add more formatting to QTextDocumentWriter when writing ODF files
96340a6556 Mark QCoreApplication::applicationPid() as const function

The third patch is from upstream.
Can anyone give me a hint what I should do to solve this?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/development/attachments/20180320/6c45f5cd/attachment.html>