• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/3.2' · 49db3a45
    Eike Ziller authored
    Conflicts:
    	qtcreator.pri
    	qtcreator.qbs
    	src/plugins/coreplugin/editormanager/editormanager.cpp
    	src/plugins/cppeditor/cppeditor.cpp
    	src/plugins/remotelinux/remotelinuxdebugsupport.cpp
    	src/plugins/texteditor/basetexteditor.cpp
    
    Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
    49db3a45
cpptoolseditorsupport.cpp 21.4 KB