From 8840168fc568b88a7beb8fd83075a5e45174642d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 21 Sep 2011 08:31:14 +0200 Subject: Revert "QmlDesigner: bug fix for components" Fix wasn't fixing anything, the slash is not in libraryPath but in the string that is appended to it. This reverts commit 95009e0a414db61f5f6e1b2bf5f7048d35907f49. --- share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp index 733e73ec2d..932f22e415 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp @@ -804,7 +804,7 @@ static inline QString fixComponentPathForIncompatibleQt(const QString &component if (componentPath.contains(importString)) { int index = componentPath.indexOf(importString) + 8; const QString relativeImportPath = componentPath.right(componentPath.length() - index); - QString fixedComponentPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QLatin1Char('/') + relativeImportPath; + QString fixedComponentPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + relativeImportPath; fixedComponentPath.replace(QLatin1Char('\\'), QLatin1Char('/')); if (QFileInfo(fixedComponentPath).exists()) return fixedComponentPath; -- cgit v1.2.3