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

QmlDesigner: set QT_QUICK_CONTROLS_CONF

Browse Source 
If we have a qtquickcontrols2.conf we set QT_QUICK_CONTROLS_CONF
for the qml2puppet.

For this we have to forward the project to PuppetCreator.
I forwarded the project instead of just the path to qtquickcontrols2.conf,
because we most likely add more project specific features in the future.

Change-Id: I0a90636ca6903e28499018c8d769bb07f7be5bb6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2016-09-27 12:27:51 +02:00
parent 43afc5d1ad
commit 18817a9a74
11 changed files with 77 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmldesigner/components/integration/designdocument.cpp
View File

@@ -608,6 +608,7 @@ void DesignDocument::setEditor(Core::IEditor *editor)
this, &DesignDocument::updateFileName);
updateActiveQtVersion();
updateCurrentProject();
}
Core::IEditor *DesignDocument::editor() const
@@ -666,6 +667,12 @@ static inline Kit *getActiveKit(DesignDocument *designDocument)
QObject::connect(currentProject, &Project::activeTargetChanged,
designDocument, &DesignDocument::updateActiveQtVersion, Qt::UniqueConnection);
QObject::connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
designDocument, &DesignDocument::updateCurrentProject, Qt::UniqueConnection);
QObject::connect(currentProject, &Project::activeTargetChanged,
designDocument, &DesignDocument::updateCurrentProject, Qt::UniqueConnection);
Target *target = currentProject->activeTarget();
@@ -686,6 +693,12 @@ void DesignDocument::updateActiveQtVersion()
viewManager().setNodeInstanceViewKit(m_currentKit);
}
void DesignDocument::updateCurrentProject()
{
ProjectExplorer::Project *currentProject = ProjectExplorer::SessionManager::projectForFile(fileName());
viewManager().setNodeInstanceViewProject(currentProject);
}
QString DesignDocument::contextHelpId() const
{
if (view())