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

QmlDesigner: Adding support for QML_DESIGNER_IMPORT_PATH in .pro file

Browse Source 
The user can set QML_DESIGNER_IMPORT_PATH to define
a qml import path just for qml2puppet.

Change-Id: Ic9dac4cf478c9d0f8d6e066d6a9a481500cc5497
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2016-09-28 17:49:50 +02:00
parent b0bf07c64a
commit 5e1debe9f4
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -2010,6 +2010,8 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
result->newVarValues[ConfigVar] = input.readerExact->values(QLatin1String("CONFIG")); result->newVarValues[ConfigVar] = input.readerExact->values(QLatin1String("CONFIG"));
result->newVarValues[QmlImportPathVar] = input.readerExact->absolutePathValues( result->newVarValues[QmlImportPathVar] = input.readerExact->absolutePathValues(
QLatin1String("QML_IMPORT_PATH"), input.projectDir); QLatin1String("QML_IMPORT_PATH"), input.projectDir);
result->newVarValues[QmlDesignerImportPathVar] = input.readerExact->absolutePathValues(
QLatin1String("QML_DESIGNER_IMPORT_PATH"), input.projectDir);
result->newVarValues[Makefile] = input.readerExact->values(QLatin1String("MAKEFILE")); result->newVarValues[Makefile] = input.readerExact->values(QLatin1String("MAKEFILE"));
result->newVarValues[QtVar] = input.readerExact->values(QLatin1String("QT")); result->newVarValues[QtVar] = input.readerExact->values(QLatin1String("QT"));
result->newVarValues[ObjectExt] = input.readerExact->values(QLatin1String("QMAKE_EXT_OBJ")); result->newVarValues[ObjectExt] = input.readerExact->values(QLatin1String("QMAKE_EXT_OBJ"));

1
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -94,6 +94,7 @@ enum QmakeVariable {
ConfigVar, ConfigVar,
QtVar, QtVar,
QmlImportPathVar, QmlImportPathVar,
QmlDesignerImportPathVar,
Makefile, Makefile,
ObjectExt, ObjectExt,
ObjectsDir, ObjectsDir,

25
src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
View File

@@ -36,6 +36,8 @@
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <qmakeprojectmanager/qmakeproject.h>
#include <qmakeprojectmanager/qmakenodes.h>
#include <coreplugin/messagebox.h> #include <coreplugin/messagebox.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
@@ -388,6 +390,21 @@ QProcessEnvironment PuppetCreator::processEnvironment() const
} }
QStringList importPaths = m_model->importPaths(); QStringList importPaths = m_model->importPaths();
if (m_currentProject) {
for (const QString &fileName : m_currentProject->files(ProjectExplorer::Project::SourceFiles)) {
QFileInfo fileInfo(fileName);
if (fileInfo.fileName() == "qtquickcontrols2.conf")
environment.appendOrSet("QT_QUICK_CONTROLS_CONF", fileName);
}
QmakeProjectManager::QmakeProject *qmakeProject = qobject_cast<QmakeProjectManager::QmakeProject *>(m_currentProject);
if (qmakeProject) {
QStringList designerImports = qmakeProject->rootProjectNode()->variableValue(QmakeProjectManager::QmlDesignerImportPathVar);
importPaths.append(designerImports);
}
}
if (m_availablePuppetType == FallbackPuppet) if (m_availablePuppetType == FallbackPuppet)
importPaths.append(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)); importPaths.append(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath));
if (m_availablePuppetType != FallbackPuppet) if (m_availablePuppetType != FallbackPuppet)
@@ -398,14 +415,6 @@ QProcessEnvironment PuppetCreator::processEnvironment() const
qCInfo(puppetStart) << "Puppet import paths:" << importPaths; qCInfo(puppetStart) << "Puppet import paths:" << importPaths;
qCInfo(puppetStart) << "Puppet environment:" << environment.toStringList(); qCInfo(puppetStart) << "Puppet environment:" << environment.toStringList();
if (m_currentProject) {
for (const QString &fileName : m_currentProject->files(ProjectExplorer::Project::SourceFiles)) {
QFileInfo fileInfo(fileName);
if (fileInfo.fileName() == "qtquickcontrols2.conf")
environment.appendOrSet("QT_QUICK_CONTROLS_CONF", fileName);
}
}
return environment.toProcessEnvironment(); return environment.toProcessEnvironment();
} }