• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/2.4' · 912cd548
    Eike Ziller authored
    Conflicts:
    	src/libs/qmljs/qmljsinterpreter.cpp
    	src/libs/qmljs/qmljsinterpreter.h
    	src/plugins/madde/maemopackagecreationstep.cpp
    	src/plugins/projectexplorer/buildmanager.cpp
    	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
    	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
    	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp
    
    Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7
    912cd548
basetexteditor.cpp 212 KB