Merge "Fix DownloadProviderTests." into qt-dev