forked from qt-creator/qt-creator
Prevent symbol clashes for qml classes
Fix namespace usage such that all classes in shared/qml live in the Qml namespace, and classes in QmlDesigner plugin in the QmlDesigner namespace. This should prevent any symbol clashes until we can finally get rid of the file dublicates (e.g. QmlDocument).
This commit is contained in:
@@ -100,8 +100,8 @@ void QmlProjectPlugin::extensionsInitialized()
|
||||
|
||||
QmlEditor::QmlModelManagerInterface *modelManager = pluginManager->getObject<QmlEditor::QmlModelManagerInterface>();
|
||||
Q_ASSERT(modelManager);
|
||||
connect(modelManager, SIGNAL(documentUpdated(QmlEditor::QmlDocument::Ptr)),
|
||||
m_qmlTaskManager, SLOT(documentUpdated(QmlEditor::QmlDocument::Ptr)));
|
||||
connect(modelManager, SIGNAL(documentUpdated(Qml::QmlDocument::Ptr)),
|
||||
m_qmlTaskManager, SLOT(documentUpdated(Qml::QmlDocument::Ptr)));
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(QmlProjectPlugin)
|
||||
|
Reference in New Issue
Block a user