diff options
| author | David Kaspar <dkaspar@blackberry.com> | 2013-09-13 21:04:36 +0200 |
|---|---|---|
| committer | David Kaspar <dkaspar@blackberry.com> | 2013-09-17 13:38:12 +0200 |
| commit | 59859d03f9ffef14d867c9cd513bccd24e653205 (patch) | |
| tree | 2a1d5a9a3aca015aa25d90c86f9da04b4f88b23f /src | |
| parent | 2a3ef09473d0af1f8bb2ffa89fd737913341d688 (diff) | |
| download | qt-creator-59859d03f9ffef14d867c9cd513bccd24e653205.tar.gz | |
Qnx: Fixing BarDescriptorEditor to prevent loosing syntax highlighting
Task-Number: QTCREATORBUG-10039
Change-Id: I8a6b80d18da1be0697bd8aaceb5d8670105a8f49
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qnx/bardescriptordocument.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qnx/bardescriptoreditorwidget.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/qnx/bardescriptoreditorwidget.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/qnx/bardescriptordocument.cpp b/src/plugins/qnx/bardescriptordocument.cpp index 1a11c70c6a..1236186b6e 100644 --- a/src/plugins/qnx/bardescriptordocument.cpp +++ b/src/plugins/qnx/bardescriptordocument.cpp @@ -95,6 +95,7 @@ bool BarDescriptorDocument::open(QString *errorString, const QString &fileName) return false; setFilePath(fileName); + m_editorWidget->setFilePath(fileName); bool result = loadContent(contents); diff --git a/src/plugins/qnx/bardescriptoreditorwidget.cpp b/src/plugins/qnx/bardescriptoreditorwidget.cpp index 98fcaf925c..70fda5c2f4 100644 --- a/src/plugins/qnx/bardescriptoreditorwidget.cpp +++ b/src/plugins/qnx/bardescriptoreditorwidget.cpp @@ -204,6 +204,13 @@ BarDescriptorEditorAssetsWidget *BarDescriptorEditorWidget::assetsWidget() const return m_assetsWidget; } +void BarDescriptorEditorWidget::setFilePath(const QString &filePath) +{ + Core::IDocument *doc = m_xmlSourceWidget->editorDocument(); + if (doc) + doc->setFilePath(filePath); +} + QString BarDescriptorEditorWidget::xmlSource() const { return m_xmlSourceWidget->toPlainText(); diff --git a/src/plugins/qnx/bardescriptoreditorwidget.h b/src/plugins/qnx/bardescriptoreditorwidget.h index ba4409268b..14a27da8c1 100644 --- a/src/plugins/qnx/bardescriptoreditorwidget.h +++ b/src/plugins/qnx/bardescriptoreditorwidget.h @@ -79,6 +79,7 @@ public: BarDescriptorEditorAssetsWidget *assetsWidget() const; + void setFilePath(const QString &filePath); QString xmlSource() const; void setXmlSource(const QString &xmlSource); |
