Merge remote-tracking branch 'origin/3.0'
Conflicts: qtcreator.pri qtcreator.qbs src/shared/qbs Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
No related branches found
No related tags found
Showing
- dist/changes-3.0.1 70 additions, 0 deletionsdist/changes-3.0.1
- qtcreator.pri 1 addition, 0 deletionsqtcreator.pri
- share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro 1 addition, 0 deletionsshare/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
- share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/StringEditorTemplate.template 2 additions, 1 deletion...mlSources/PropertyTemplates/StringEditorTemplate.template
- share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/TemplateTypes.qml 1 addition, 1 deletion...pertyEditorQmlSources/PropertyTemplates/TemplateTypes.qml
- share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml 1 addition, 1 deletion...propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml
- share/qtcreator/translations/qtcreator_ru.ts 37 additions, 5 deletionsshare/qtcreator/translations/qtcreator_ru.ts
- share/qtcreator/welcomescreen/widgets/SearchBar.qml 10 additions, 15 deletionsshare/qtcreator/welcomescreen/widgets/SearchBar.qml
- share/qtcreator/welcomescreen/widgets/SideBar.qml 1 addition, 1 deletionshare/qtcreator/welcomescreen/widgets/SideBar.qml
- src/libs/utils/filenamevalidatinglineedit.cpp 1 addition, 1 deletionsrc/libs/utils/filenamevalidatinglineedit.cpp
- src/libs/utils/projectnamevalidatinglineedit.cpp 1 addition, 1 deletionsrc/libs/utils/projectnamevalidatinglineedit.cpp
- src/plugins/coreplugin/coreconstants.h 1 addition, 0 deletionssrc/plugins/coreplugin/coreconstants.h
- src/plugins/coreplugin/mainwindow.cpp 6 additions, 0 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/help/helpplugin.cpp 3 additions, 17 deletionssrc/plugins/help/helpplugin.cpp
- src/plugins/ios/iosrunconfiguration.cpp 16 additions, 0 deletionssrc/plugins/ios/iosrunconfiguration.cpp
- src/plugins/ios/iosrunconfiguration.h 3 additions, 0 deletionssrc/plugins/ios/iosrunconfiguration.h
- src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp 3 additions, 1 deletion...designer/components/propertyeditor/fileresourcesmodel.cpp
- src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.cpp 8 additions, 5 deletions...ner/components/stateseditor/stateseditorimageprovider.cpp
- src/plugins/qmldesigner/components/stateseditor/stateslist.qml 0 additions, 1 deletion...lugins/qmldesigner/components/stateseditor/stateslist.qml
- src/plugins/qnx/qnxdeviceconfigurationwizard.cpp 2 additions, 1 deletionsrc/plugins/qnx/qnxdeviceconfigurationwizard.cpp
Loading
Please register or sign in to comment