• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/2.4' · 85cf2b66
    Eike Ziller authored
    Conflicts:
    	src/libs/qmljs/qmljsinterpreter.cpp
    	src/libs/qmljs/qmljsinterpreter.h
    	src/plugins/debugger/qml/scriptconsole.cpp
    	src/plugins/git/gitplugin.cpp
    	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
    	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h
    
    Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
    85cf2b66
behaviorsettings.cpp 3.49 KB