• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/3.1' · 0fb641c9
    Eike Ziller authored
    Conflicts:
    	qtcreator.pri
    	qtcreator.qbs
    	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
    	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
    
    Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
    0fb641c9
src.qbs 1.41 KB