Merge "Move implementations to DataSourceBase.h" into qt-dev