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

QmlDesigner.PropertyEditor: fix resource urls

Browse Source 
When checking for existence we have to convert the url back.

Change-Id: I74536ca88d95b0013239d5ba63db99568e41ab00
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Thomas Hartmann
2013-01-29 12:58:30 +01:00
parent 6956eb1d84
commit 76bf971cb9
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View File

@@ -754,14 +754,14 @@ void PropertyEditor::resetView()
hierarchy << m_selectedNode.metaInfo().superClasses();
foreach (const NodeMetaInfo &info, hierarchy) {
if (QFileInfo(qmlSpecificsFile.toLocalFile()).exists())
if (QFileInfo(fileFromUrl(qmlSpecificsFile)).exists())
break;
qmlSpecificsFile = fileToUrl(locateQmlFile(info, fixTypeNameForPanes(info.typeName()) + "Specifics.qml"));
diffClassName = info.typeName();
}
}
if (!QFileInfo(qmlSpecificsFile.toLocalFile()).exists())
if (!QFileInfo(fileFromUrl(qmlSpecificsFile)).exists())
diffClassName = specificsClassName;
QString specificQmlData;
@@ -1050,6 +1050,16 @@ QUrl PropertyEditor::fileToUrl(const QString &filePath) const {
return fileUrl;
}
QString PropertyEditor::fileFromUrl(const QUrl &url) const
{
if (url.scheme() == QLatin1String("qrc")) {
const QString &path = url.path();
return QLatin1String(":") + path;
}
return url.toLocalFile();
}
QUrl PropertyEditor::qmlForNode(const ModelNode &modelNode, QString &className) const
{
if (modelNode.isValid()) {

1
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
View File

@@ -128,6 +128,7 @@ private slots:
private: //functions
QString qmlFileName(const NodeMetaInfo &nodeInfo) const;
QUrl fileToUrl(const QString &filePath) const;
QString fileFromUrl(const QUrl &url) const;
QUrl qmlForNode(const ModelNode &modelNode, QString &className) const;
QString locateQmlFile(const NodeMetaInfo &info, const QString &relativePath) const;
void select(const ModelNode& node);