forked from qt-creator/qt-creator
1e53f104d4
add QWidget include in src/plugins/qmldesigner/libs/designercore/model/model.cpp
prepare src/plugins/lua/CMakeLists.txt if lua plugin is not built
Necessary change in:
src/plugins/qmldesigner/components/toolbar/messagemodel.h
Because Utils::Id is a friend of qHash now, QtCreator API
removed uniqueIdentifier().
std::unordered_map<quintptr, ProjectExplorer::TaskCategory>
->
QHash<Utils::Id, ProjectExplorer::TaskCategory> m_categories = {};
other resolved Conflicts were in:
cmake/QtCreatorAPI.cmake
cmake/QtCreatorAPIInternal.cmake
share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl
share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
src/plugins/effectcomposer/effectcomposerview.cpp
src/plugins/effectcomposer/effectcomposerwidget.cpp
src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp
src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
src/plugins/qmldesigner/designmodecontext.cpp
src/plugins/qmldesigner/designmodewidget.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
src/plugins/studiowelcome/examplecheckout.h
Change-Id: Ia6c204460baf4de886e45666d859ca048d578bcb