aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designercore/include/textmodifier.h
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2014-09-08 12:08:00 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-09-08 12:36:29 +0200
commit8c17e3b3a26fd33ce14c0ae9c0980ce6e3f04c28 (patch)
treea50efaebabb79ecb2acc22af6546e48d6713e5a5 /src/plugins/qmldesigner/designercore/include/textmodifier.h
parentb66155cf179dcdbf86c6379d6c9eed1446b47fa3 (diff)
QmlDesigner: Fix regression for import paths
The imports paths used by the sub component manger and meta info system were not correctly resolved. The main reason was that the textDocument in the text modifiers are just plain text buffers and do not containt any url for the document. This patch removes importPaths() from the TextModifier. The ViewerContext can be stored in the TextToModelMerger and does not have to be recreated when needed. Change-Id: I17281caee23ddd51f6e36d5346bc3bd7c53005e8 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/include/textmodifier.h')
-rw-r--r--src/plugins/qmldesigner/designercore/include/textmodifier.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h
index d95405e047..c9187baf98 100644
--- a/src/plugins/qmldesigner/designercore/include/textmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/textmodifier.h
@@ -84,7 +84,6 @@ public:
virtual void reactivateChangeSignals() = 0;
static QmlJS::Snapshot qmljsSnapshot();
- virtual QStringList importPaths() const = 0;
virtual bool renameId(const QString &oldId, const QString &newId) = 0;