Merge branch 'master' into core-updates

gnu: Add Qt 4.8.5.

* gnu/packages/qt.scm (qt-4): New variable.
* gnu/packages/patches/qt4-tests.patch: New file, patch dropping tests
    requiring a running X server.