• con's avatar
    Merge branch '2.1' · b1bcf081
    con authored
    Conflicts:
    	src/plugins/coreplugin/basemode.cpp
    	src/plugins/coreplugin/basemode.h
    	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
    	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
    	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
    	src/plugins/debugger/debuggeragents.cpp
    	src/plugins/debugger/debuggeruiswitcher.cpp
    	src/plugins/debugger/debuggeruiswitcher.h
    	src/plugins/projectexplorer/buildconfigdialog.cpp
    	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
    	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
    	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
    	src/plugins/qmldesigner/designercore/include/modelutilities.h
    	src/plugins/qmldesigner/designercore/include/nodeinstance.h
    	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
    	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
    	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
    	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
    	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
    	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
    	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
    	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
    	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
    	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
    	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
    	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
    	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
    	src/plugins/snippets/inputwidget.cpp
    	src/plugins/snippets/snippetscompletion.cpp
    	src/plugins/snippets/snippetscompletion.h
    	src/plugins/snippets/snippetspec.cpp
    	src/plugins/snippets/snippetsplugin.cpp
    	src/plugins/snippets/snippetswindow.cpp
    	src/plugins/snippets/snippetswindow.h
    	src/plugins/texteditor/snippetsparser.cpp
    	src/tools/qml/qmldom/main.cpp
    	tests/manual/trk/runner.cpp
    	tests/manual/trk/trkolddevice.cpp
    	tests/manual/trk/trkolddevice.h
    	tests/manual/trk/trkserver.cpp
    b1bcf081
runsettingspropertiespage.h 3.71 KB