Merge "Work on issue #112467931: APR about content provider without package" into qt-dev