forked from qt-creator/qt-creator
QmlDesigner: Register QML types already in the plugin
The states editor is using some of the types, too. We have to move the type registration out of the property editor in the future. Change-Id: I8a8b38180592a5785592e2482f35aad70208e62c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Aleksei German <aleksei.german@qt.io>
This commit is contained in:
@@ -97,7 +97,6 @@ PropertyEditorView::PropertyEditorView(AsynchronousImageCache &imageCache)
|
||||
|
||||
m_stackedWidget->insertWidget(0, new QWidget(m_stackedWidget));
|
||||
|
||||
Quick2PropertyEditorView::registerQmlTypes();
|
||||
m_stackedWidget->setWindowTitle(tr("Properties"));
|
||||
}
|
||||
|
||||
|
@@ -26,14 +26,15 @@
|
||||
#include "qmldesignerplugin.h"
|
||||
#include "designmodecontext.h"
|
||||
#include "designmodewidget.h"
|
||||
#include "dynamiclicensecheck.h"
|
||||
#include "exception.h"
|
||||
#include "generateresource.h"
|
||||
#include "nodeinstanceview.h"
|
||||
#include "openuiqmlfiledialog.h"
|
||||
#include "qmldesignerconstants.h"
|
||||
#include "qmldesignerprojectmanager.h"
|
||||
#include "quick2propertyeditorview.h"
|
||||
#include "settingspage.h"
|
||||
#include "dynamiclicensecheck.h"
|
||||
|
||||
#include <metainfo.h>
|
||||
#include <connectionview.h>
|
||||
@@ -280,7 +281,8 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e
|
||||
|
||||
designerActionManager().addDesignerAction(shutDownNanotraceAction);
|
||||
#endif
|
||||
|
||||
//TODO Move registering those types out of the property editor, since they are used also in the states editor
|
||||
Quick2PropertyEditorView::registerQmlTypes();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user