Fixed text drawing regression in Assistant.
Fixed text drawing regression in Assistant.

Revert parts of adf322c514a5781dcb9ec304d44229fa47d5e8b3 to
get this to work as in 4.5.2 again. What the original
patch fixed, we don't really know..

Reviewed-by: Simon Hausmann
(cherry picked from commit d04c169e424c0feee61763764e841ef132ba359f)

KDE/qt,igor-sfdc/qt-wk,igor-sfdc/qt-wk,KDE/qt,RLovelett/qt,igor-sfdc/qt-wk,RLovelett/qt,igor-sfdc/qt-wk,radekp/qt,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,radekp/qt,pruiz/wkhtmltopdf-qt,RLovelett/qt,radekp/qt,radekp/qt,radekp/qt,KDE/qt,KDE/qt,pruiz/wkhtmltopdf-qt,igor-sfdc/qt-wk,radekp/qt,KDE/qt,pruiz/wkhtmltopdf-qt,radekp/qt,radekp/qt,radekp/qt,pruiz/wkhtmltopdf-qt,RLovelett/qt,KDE/qt,igor-sfdc/qt-wk,RLovelett/qt,pruiz/wkhtmltopdf-qt,KDE/qt,RLovelett/qt,KDE/qt,igor-sfdc/qt-wk,igor-sfdc/qt-wk,igor-sfdc/qt-wk,RLovelett/qt,igor-sfdc/qt-wk,radekp/qt,igor-sfdc/qt-wk,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,RLovelett/qt,RLovelett/qt,RLovelett/qt,pruiz/wkhtmltopdf-qt,pruiz/wkhtmltopdf-qt,RLovelett/qt