• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/2.4' · 81cce890
    Eike Ziller authored
    Conflicts:
    	qtcreator.pri
    	src/libs/qmljs/qmljscheck.cpp
    	src/plugins/debugger/gdb/gdbengine.cpp
    	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
    	src/plugins/plugins.pro
    	src/plugins/projectexplorer/buildmanager.cpp
    	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
    
    Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
    81cce890
qtcreator.pri 4.19 KB