feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge "Merge remote-tracking branch 'origin/4.14'"

Browse Source
This commit is contained in:
The Qt Project
2021-02-22 11:20:52 +00:00
parent b066b3029e c55e59cb77
commit ec5f7d8a6b
8 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/coreplugin/CMakeLists.txt
View File

@@ -206,3 +206,6 @@ if ((NOT WIN32) AND (NOT APPLE))
)
endforeach()
endif()
# transitional qmake plugin build support
qtc_add_public_header(coreplugin_dependencies.pri)

2
src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp
View File

@@ -186,7 +186,7 @@ FormEditorItem *FormEditorScene::addFormEditorItem(const QmlItemNode &qmlItemNod
else
formEditorItem = new FormEditorItem(qmlItemNode, this);
Q_ASSERT(!m_qmlItemNodeItemHash.contains(qmlItemNode));
QTC_ASSERT(!m_qmlItemNodeItemHash.contains(qmlItemNode), ;);
m_qmlItemNodeItemHash.insert(qmlItemNode, formEditorItem);
if (qmlItemNode.isRootNode()) {