Merge remote-tracking branch 'origin/2.7'
Conflicts: src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
No related branches found
No related tags found
Showing
- dist/installer/mac/qmlpuppet_qt.conf 2 additions, 1 deletiondist/installer/mac/qmlpuppet_qt.conf
- qtcreator.pro 1 addition, 1 deletionqtcreator.pro
- scripts/deployqtHelper_mac.sh 24 additions, 4 deletionsscripts/deployqtHelper_mac.sh
- share/qtcreator/qml/qmldump/main.cpp 7 additions, 2 deletionsshare/qtcreator/qml/qmldump/main.cpp
- share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp 6 additions, 6 deletions.../qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp
- share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp 4 additions, 2 deletions...qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
- share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp 21 additions, 22 deletions...qml2puppet/instances/qt5informationnodeinstanceserver.cpp
- share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h 1 addition, 1 deletion...t/qml2puppet/instances/qt5informationnodeinstanceserver.h
- share/qtcreator/templates/qtquick2app/qtquick2applicationviewer/qtquick2applicationviewer.cpp 1 addition, 1 deletion...p/qtquick2applicationviewer/qtquick2applicationviewer.cpp
- share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp 1 addition, 1 deletion.../qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
- src/libs/cplusplus/pp-engine.cpp 2 additions, 0 deletionssrc/libs/cplusplus/pp-engine.cpp
- src/libs/qmljs/qmljsmodelmanagerinterface.h 3 additions, 2 deletionssrc/libs/qmljs/qmljsmodelmanagerinterface.h
- src/plugins/git/giteditor.cpp 1 addition, 1 deletionsrc/plugins/git/giteditor.cpp
- src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp 1 addition, 1 deletion.../qmldesigner/components/formeditor/abstractcustomtool.cpp
- src/plugins/qmldesigner/componentsplugin/components.metainfo 10 additions, 0 deletionssrc/plugins/qmldesigner/componentsplugin/components.metainfo
- src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp 2 additions, 0 deletions...qmldesigner/designercore/metainfo/subcomponentmanager.cpp
- src/plugins/qmljstools/qmljsmodelmanager.cpp 2 additions, 0 deletionssrc/plugins/qmljstools/qmljsmodelmanager.cpp
- src/plugins/qmljstools/qmljsplugindumper.cpp 2 additions, 0 deletionssrc/plugins/qmljstools/qmljsplugindumper.cpp
- src/plugins/qt4projectmanager/qt4project.cpp 0 additions, 1 deletionsrc/plugins/qt4projectmanager/qt4project.cpp
- src/plugins/qt4projectmanager/wizards/qtquickapp.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/wizards/qtquickapp.cpp
Loading
Please register or sign in to comment