From 59859d03f9ffef14d867c9cd513bccd24e653205 Mon Sep 17 00:00:00 2001
From: David Kaspar <dkaspar@blackberry.com>
Date: Fri, 13 Sep 2013 21:04:36 +0200
Subject: [PATCH] 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>
---
src/plugins/qnx/bardescriptordocument.cpp | 1 +
src/plugins/qnx/bardescriptoreditorwidget.cpp | 7 +++++++
src/plugins/qnx/bardescriptoreditorwidget.h | 1 +
3 files changed, 9 insertions(+)
diff --git a/src/plugins/qnx/bardescriptordocument.cpp b/src/plugins/qnx/bardescriptordocument.cpp
index 1a11c70c6a0..1236186b6e0 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 98fcaf925c4..70fda5c2f4e 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 ba4409268b3..14a27da8c1a 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);
--
GitLab