diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-16 15:17:21 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-16 15:17:21 +0200 |
| commit | 914adeab82d228773def64c9c304d1e15bab0b52 (patch) | |
| tree | 9ab0f8e7b09d62b77ffc5450d9e883a89d69fd88 /src/plugins/qmldesigner/designercore/include/componenttextmodifier.h | |
| parent | 11f89ece8de7763f811d2fe1e45cb27ad4a77519 (diff) | |
| parent | a4db6db358aefb60bac34cacbab23aa6f38279f7 (diff) | |
| download | qt-creator-914adeab82d228773def64c9c304d1e15bab0b52.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
Diffstat (limited to 'src/plugins/qmldesigner/designercore/include/componenttextmodifier.h')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/include/componenttextmodifier.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h b/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h index b31d6506a3..6314568fe4 100644 --- a/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h @@ -58,8 +58,6 @@ public: virtual void deactivateChangeSignals(); virtual void reactivateChangeSignals(); - virtual QStringList importPaths() const; - virtual bool renameId(const QString & /* oldId */, const QString & /* newId */) { return false; } public slots: |