Merge remote branch 'origin/2.1'
Conflicts: share/qtcreator/static.pro src/plugins/cppeditor/cppeditor.cpp src/plugins/qmljseditor/qmljseditor.cpp src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui src/plugins/qt4projectmanager/qtoutputformatter.cpp src/plugins/texteditor/generichighlighter/highlightersettings.cpp
Showing
- share/qtcreator/qml/qmlobserver/main.cpp 1 addition, 1 deletionshare/qtcreator/qml/qmlobserver/main.cpp
- share/qtcreator/static.pro 2 additions, 1 deletionshare/qtcreator/static.pro
- share/qtcreator/templates/qmlapp/main.cpp 1 addition, 1 deletionshare/qtcreator/templates/qmlapp/main.cpp
- share/qtcreator/templates/wizards/qml-extension/project.pro 7 additions, 5 deletionsshare/qtcreator/templates/wizards/qml-extension/project.pro
- share/qtcreator/translations/qtcreator_pl.ts 71 additions, 507 deletionsshare/qtcreator/translations/qtcreator_pl.ts
- src/libs/qmleditorwidgets/gradientline.cpp 39 additions, 28 deletionssrc/libs/qmleditorwidgets/gradientline.cpp
- src/plugins/cppeditor/cppeditor.cpp 1 addition, 1 deletionsrc/plugins/cppeditor/cppeditor.cpp
- src/plugins/cpptools/cppcodecompletion.cpp 38 additions, 4 deletionssrc/plugins/cpptools/cppcodecompletion.cpp
- src/plugins/glsleditor/glsleditor.cpp 0 additions, 1 deletionsrc/plugins/glsleditor/glsleditor.cpp
- src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp 4 additions, 4 deletions...igner/components/propertyeditor/qmlanchorbindingproxy.cpp
- src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp 1 addition, 1 deletion...ns/qmldesigner/designercore/metainfo/propertymetainfo.cpp
- src/plugins/qmldesigner/qtquickplugin/quick.metainfo 3 additions, 0 deletionssrc/plugins/qmldesigner/qtquickplugin/quick.metainfo
- src/plugins/qmljseditor/qmljseditor.cpp 0 additions, 1 deletionsrc/plugins/qmljseditor/qmljseditor.cpp
- src/plugins/qmljsinspector/qmljsinspector.cpp 7 additions, 0 deletionssrc/plugins/qmljsinspector/qmljsinspector.cpp
- src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp 23 additions, 10 deletions...ins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
- src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui 51 additions, 46 deletions...gins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
- src/plugins/qt4projectmanager/qmldumptool.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qmldumptool.cpp
- src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp 0 additions, 1 deletion...gins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
- src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui 15 additions, 0 deletions...ugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
- src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp 14 additions, 13 deletions...plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
Loading
Please register or sign in to comment