Hi Daniel,
Gerrit detected a conflict when it tried to merge your patch. The solution to
the problem is usually to rebase your patches onto the latest HEAD of the
branch you're targeting. Basically:
git fetch
git rebase origin/branch (dev or 5.11, whichever one you're targeting)
(if required re
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"-butto
