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

Change-Id: Ief48e22515b0a2674a1bbe576a6500f2a2f8292d