dfd00bca7e
Conflicts: .qmake.conf Change-Id: Ic2b4c2bf7b985c97d75d70980413da4f569f207a
Conflicts: .qmake.conf Change-Id: Ic2b4c2bf7b985c97d75d70980413da4f569f207a