Merge remote branch 'origin/2.0'
Conflicts: share/qtcreator/gdbmacros/dumper.py src/libs/qmljs/qmljs-lib.pri src/plugins/fakevim/fakevimhandler.cpp
No related branches found
No related tags found
Showing
- share/qtcreator/gdbmacros/dumper.py 1 addition, 1 deletionshare/qtcreator/gdbmacros/dumper.py
- src/libs/qmljs/qmljs-lib.pri 1 addition, 0 deletionssrc/libs/qmljs/qmljs-lib.pri
- src/libs/qmljs/qmljsicontextpane.h 32 additions, 0 deletionssrc/libs/qmljs/qmljsicontextpane.h
- src/plugins/bineditor/bineditor.cpp 79 additions, 7 deletionssrc/plugins/bineditor/bineditor.cpp
- src/plugins/bineditor/bineditor.h 3 additions, 0 deletionssrc/plugins/bineditor/bineditor.h
- src/plugins/designer/formeditorstack.cpp 2 additions, 2 deletionssrc/plugins/designer/formeditorstack.cpp
- src/plugins/find/findtoolwindow.cpp 13 additions, 0 deletionssrc/plugins/find/findtoolwindow.cpp
- src/plugins/find/findtoolwindow.h 3 additions, 0 deletionssrc/plugins/find/findtoolwindow.h
- src/plugins/projectexplorer/foldernavigationwidget.cpp 2 additions, 0 deletionssrc/plugins/projectexplorer/foldernavigationwidget.cpp
- src/plugins/projectexplorer/outputformatter.cpp 12 additions, 25 deletionssrc/plugins/projectexplorer/outputformatter.cpp
- src/plugins/projectexplorer/outputformatter.h 2 additions, 3 deletionssrc/plugins/projectexplorer/outputformatter.h
- src/plugins/projectexplorer/outputwindow.cpp 4 additions, 2 deletionssrc/plugins/projectexplorer/outputwindow.cpp
- src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp 73 additions, 51 deletions...ins/qmldesigner/components/propertyeditor/colorwidget.cpp
- src/plugins/qmldesigner/components/propertyeditor/colorwidget.h 12 additions, 3 deletions...ugins/qmldesigner/components/propertyeditor/colorwidget.h
- src/plugins/qmldesigner/components/propertyeditor/contextpanetext.ui 418 additions, 0 deletions.../qmldesigner/components/propertyeditor/contextpanetext.ui
- src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.cpp 345 additions, 0 deletions...igner/components/propertyeditor/contextpanetextwidget.cpp
- src/plugins/qmldesigner/components/propertyeditor/contextpanetextwidget.h 67 additions, 0 deletions...esigner/components/propertyeditor/contextpanetextwidget.h
- src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.cpp 215 additions, 0 deletions...ldesigner/components/propertyeditor/contextpanewidget.cpp
- src/plugins/qmldesigner/components/propertyeditor/contextpanewidget.h 64 additions, 0 deletions...qmldesigner/components/propertyeditor/contextpanewidget.h
- src/plugins/qmldesigner/components/propertyeditor/fontsizespinbox.cpp 73 additions, 0 deletions...qmldesigner/components/propertyeditor/fontsizespinbox.cpp
Loading
Please register or sign in to comment