• con's avatar
    Merge remote branch 'origin/2.0' · 458a25ef
    con authored
    Conflicts:
    	doc/qt-html-templates.qdocconf
    	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
    	src/plugins/qmljseditor/qmljscodecompletion.cpp
    458a25ef
qt-html-templates.qdocconf 8.54 KB