Merge branch 'qml_renaming'
Conflicts: src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
No related branches found
No related tags found
Showing
- share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml 1 addition, 1 deletion...reator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
- src/libs/qmljs/qmljscheck.cpp 2 additions, 2 deletionssrc/libs/qmljs/qmljscheck.cpp
- src/libs/qmljs/qmljsinterpreter.cpp 16 additions, 17 deletionssrc/libs/qmljs/qmljsinterpreter.cpp
- src/libs/qmljs/qmljsmetatypesystem.cpp 2 additions, 3 deletionssrc/libs/qmljs/qmljsmetatypesystem.cpp
- src/plugins/plugins.pro 1 addition, 1 deletionsrc/plugins/plugins.pro
- src/plugins/qmldesigner/components/integration/designdocumentcontroller.h 1 addition, 1 deletion...esigner/components/integration/designdocumentcontroller.h
- src/plugins/qmldesigner/components/integration/multipledocumentscontroller.cpp 1 addition, 1 deletion...er/components/integration/multipledocumentscontroller.cpp
- src/plugins/qmldesigner/components/integration/multipledocumentscontroller.h 1 addition, 1 deletion...gner/components/integration/multipledocumentscontroller.h
- src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp 10 additions, 11 deletions...lugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
- src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp 2 additions, 2 deletions...s/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
- src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h 2 additions, 2 deletions...ins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
- src/plugins/qmldesigner/components/propertyeditor/basiclayouts.cpp 8 additions, 3 deletions...ns/qmldesigner/components/propertyeditor/basiclayouts.cpp
- src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h 11 additions, 5 deletions...gins/qmldesigner/components/propertyeditor/basiclayouts.h
- src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp 94 additions, 90 deletions...ns/qmldesigner/components/propertyeditor/basicwidgets.cpp
- src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h 6 additions, 1 deletion...gins/qmldesigner/components/propertyeditor/basicwidgets.h
- src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp 4 additions, 2 deletions.../qmldesigner/components/propertyeditor/behaviordialog.cpp
- src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h 2 additions, 1 deletion...ns/qmldesigner/components/propertyeditor/behaviordialog.h
- src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp 6 additions, 5 deletions...ins/qmldesigner/components/propertyeditor/colorwidget.cpp
- src/plugins/qmldesigner/components/propertyeditor/colorwidget.h 7 additions, 1 deletion...ugins/qmldesigner/components/propertyeditor/colorwidget.h
- src/plugins/qmldesigner/components/propertyeditor/fontwidget.cpp 4 additions, 2 deletions...gins/qmldesigner/components/propertyeditor/fontwidget.cpp
Loading
Please register or sign in to comment