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

QmlDesigner: Ensure design mode is registered

Browse Source 
We have to call registerDesignWidget() in extensionsInitialized()
and not delayedInitialize(), because the setup of Qt Creator is
already done when delayedInitialize() is called.

Because of this, if the original widget designer was disabled,
no design mode was available.

Change-Id: I8b02fcb10aa5305aff3c700f7831012ccf009b33
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2017-03-21 10:33:02 +01:00
parent 0dbec5a904
commit e8b3b8140b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -188,7 +188,6 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e
bool QmlDesignerPlugin::delayedInitialize() bool QmlDesignerPlugin::delayedInitialize()
{ {
integrateIntoQtCreator(d->mainWidget);
// adding default path to item library plugins // adding default path to item library plugins
const QString pluginPath = Utils::HostOsInfo::isMacHost() const QString pluginPath = Utils::HostOsInfo::isMacHost()
? QString(QCoreApplication::applicationDirPath() + "/../PlugIns/QmlDesigner") ? QString(QCoreApplication::applicationDirPath() + "/../PlugIns/QmlDesigner")
@@ -210,6 +209,7 @@ bool QmlDesignerPlugin::delayedInitialize()
void QmlDesignerPlugin::extensionsInitialized() void QmlDesignerPlugin::extensionsInitialized()
{ {
integrateIntoQtCreator(d->mainWidget);
} }
static QStringList allUiQmlFilesforCurrentProject(const Utils::FileName &fileName) static QStringList allUiQmlFilesforCurrentProject(const Utils::FileName &fileName)