[automerger skipped] Merge "Move implementations to DataSourceBase.h" into qt-dev am: 1142d3ea28 am: 2075838439 am: 4a677fbb96 -s ours
am skip reason: Change-Id Ic955189ff9f0fbc48b5b35eccdb2916dc79fdb0f with SHA-1 7edb3f7d2f is in history

Change-Id: Icdc85df2d7d026de8b51b01f9a686ad588acb929