Fix merge artifact in qbs file.
Fix merge artifact in qbs file.

Change-Id: I1c30c49bc3e5d000a97591e300f23fe55698adfe
Reviewed-by: Joerg Bornemann <47777b9406dbddd02a3fdca8341789a013805a11@digia.com>

Distrotech/qtcreator,duythanhphan/qt-creator,farseerri/git_code,Distrotech/qtcreator,colede/qtcreator,danimo/qt-creator,malikcjm/qtcreator,amyvmiwei/qt-creator,maui-packages/qt-creator,richardmg/qtcreator,amyvmiwei/qt-creator,farseerri/git_code,omniacreator/qtcreator,darksylinc/qt-creator,martyone/sailfish-qtcreator,duythanhphan/qt-creator,kuba1/qtcreator,omniacreator/qtcreator,Distrotech/qtcreator,omniacreator/qtcreator,duythanhphan/qt-creator,martyone/sailfish-qtcreator,martyone/sailfish-qtcreator,farseerri/git_code,farseerri/git_code,amyvmiwei/qt-creator,darksylinc/qt-creator,maui-packages/qt-creator,AltarBeastiful/qt-creator,maui-packages/qt-creator,xianian/qt-creator,danimo/qt-creator,malikcjm/qtcreator,maui-packages/qt-creator,martyone/sailfish-qtcreator,maui-packages/qt-creator,martyone/sailfish-qtcreator,xianian/qt-creator,malikcjm/qtcreator,kuba1/qtcreator,kuba1/qtcreator,richardmg/qtcreator,kuba1/qtcreator,farseerri/git_code,duythanhphan/qt-creator,darksylinc/qt-creator,richardmg/qtcreator,martyone/sailfish-qtcreator,richardmg/qtcreator,Distrotech/qtcreator,martyone/sailfish-qtcreator,colede/qtcreator,duythanhphan/qt-creator,malikcjm/qtcreator,duythanhphan/qt-creator,danimo/qt-creator,malikcjm/qtcreator,maui-packages/qt-creator,AltarBeastiful/qt-creator,farseerri/git_code,omniacreator/qtcreator,danimo/qt-creator,darksylinc/qt-creator,AltarBeastiful/qt-creator,AltarBeastiful/qt-creator,duythanhphan/qt-creator,AltarBeastiful/qt-creator,amyvmiwei/qt-creator,xianian/qt-creator,xianian/qt-creator,darksylinc/qt-creator,danimo/qt-creator,danimo/qt-creator,colede/qtcreator,richardmg/qtcreator,kuba1/qtcreator,Distrotech/qtcreator,omniacreator/qtcreator,Distrotech/qtcreator,colede/qtcreator,amyvmiwei/qt-creator,darksylinc/qt-creator,kuba1/qtcreator,AltarBeastiful/qt-creator,danimo/qt-creator,colede/qtcreator,maui-packages/qt-creator,danimo/qt-creator,amyvmiwei/qt-creator,malikcjm/qtcreator,martyone/sailfish-qtcreator,malikcjm/qtcreator,martyone/sailfish-qtcreator,omniacreator/qtcreator,colede/qtcreator,xianian/qt-creator,richardmg/qtcreator,Distrotech/qtcreator,xianian/qt-creator,farseerri/git_code,amyvmiwei/qt-creator,amyvmiwei/qt-creator,kuba1/qtcreator,kuba1/qtcreator,omniacreator/qtcreator,xianian/qt-creator,darksylinc/qt-creator,xianian/qt-creator,farseerri/git_code,AltarBeastiful/qt-creator,AltarBeastiful/qt-creator,darksylinc/qt-creator,xianian/qt-creator,richardmg/qtcreator,kuba1/qtcreator,danimo/qt-creator,colede/qtcreator