Fix QtConcurrent on QT < 5
Only need to wait on exit in QT 5.3

.. which is convenient because QThread::sleep is only
   public in QT 5.2.1 or higher.
Merge remote-tracking branch 'upstream/master'