diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-11-26 12:02:11 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-11-26 12:14:53 +0100 |
| commit | 03369da502bea15b9aaaccc3e4b39fac070d7927 (patch) | |
| tree | 79b97497f2bd6928c1186afe658400b369e66ab8 /src/plugins | |
| parent | e732b3c1022924e298a645ecbd7f41b9f1d71f21 (diff) | |
| download | qt-creator-03369da502bea15b9aaaccc3e4b39fac070d7927.tar.gz | |
QmlDesigner.rewriter: fix possible incompatibilities with import plugins
The current Qt Version might be build with mingw or even be a Symbian
or Maemo target. This patch ensures that we do not try to load a plugin
from the configured Qt Version anymore.
Instead we only load plugins provided by Qt Creator
or plugins which are specified by: QML_IMPORT_PATH
Reviewed-by: Kai Koehne
Reviewed-by: Erik Verbruggen
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 6e1c7483c9..41d3aa1bf5 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -580,8 +580,6 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH { // Have the QML engine check if the document is valid: QDeclarativeEngine engine; engine.setOutputWarningsToStandardError(false); - foreach (const QString &importPath, importPaths) - engine.addImportPath(importPath); QDeclarativeComponent comp(&engine); comp.setData(data.toUtf8(), url); if (comp.status() == QDeclarativeComponent::Error) { |