(cherry picked from commit bec8a1b7) Conflicts: libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx Change-Id: I11a6cda7b9b8949c48c201c4bd467b49f2f43ca5