feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Update qrc files

Browse Source 
This triggers an update on every qrc file.

Change-Id: Id34873e3bd8190d79773fbc3a8a90699d4e49cb0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2016-06-21 14:01:41 +02:00
parent a22d8bcaa3
commit 334273be84
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qmldesigner/components/integration/designdocument.cpp
View File

@@ -46,6 +46,8 @@
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
#include <coreplugin/idocument.h> #include <coreplugin/idocument.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <QFileInfo> #include <QFileInfo>
#include <QUrl> #include <QUrl>
#include <QDebug> #include <QDebug>
@@ -243,12 +245,17 @@ void DesignDocument::loadDocument(QPlainTextEdit *edit)
this, SIGNAL(dirtyStateChanged(bool))); this, SIGNAL(dirtyStateChanged(bool)));
m_documentTextModifier.reset(new BaseTextEditModifier(dynamic_cast<TextEditor::TextEditorWidget*>(plainTextEdit()))); m_documentTextModifier.reset(new BaseTextEditModifier(dynamic_cast<TextEditor::TextEditorWidget*>(plainTextEdit())));
connect(m_documentTextModifier.data(), &TextModifier::textChanged, this, &DesignDocument::updateQrcFiles);
m_documentModel->setTextModifier(m_documentTextModifier.data()); m_documentModel->setTextModifier(m_documentTextModifier.data());
m_inFileComponentTextModifier.reset(); m_inFileComponentTextModifier.reset();
updateFileName(Utils::FileName(), fileName()); updateFileName(Utils::FileName(), fileName());
updateQrcFiles();
m_documentLoaded = true; m_documentLoaded = true;
} }
@@ -277,6 +284,18 @@ void DesignDocument::changeToInFileComponentModel(ComponentTextModifier *textMod
viewManager().attachViewsExceptRewriterAndComponetView(); viewManager().attachViewsExceptRewriterAndComponetView();
} }
void DesignDocument::updateQrcFiles()
{
ProjectExplorer::Project *currentProject = ProjectExplorer::SessionManager::projectForFile(fileName());
if (currentProject) {
foreach (const QString &fileName, currentProject->files(ProjectExplorer::Project::SourceFiles)) {
if (fileName.endsWith(".qrc"))
QmlJS::ModelManagerInterface::instance()->updateQrcFile(fileName);
}
}
}
void DesignDocument::changeToSubComponent(const ModelNode &componentNode) void DesignDocument::changeToSubComponent(const ModelNode &componentNode)
{ {
if (QmlDesignerPlugin::instance()->currentDesignDocument() != this) if (QmlDesignerPlugin::instance()->currentDesignDocument() != this)

2
src/plugins/qmldesigner/components/integration/designdocument.h
View File

@@ -124,6 +124,8 @@ private slots:
private: // functions private: // functions
void changeToInFileComponentModel(ComponentTextModifier *textModifer); void changeToInFileComponentModel(ComponentTextModifier *textModifer);
void updateQrcFiles();
QWidget *centralWidget() const; QWidget *centralWidget() const;
QString pathToQt() const; QString pathToQt() const;