diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-09-21 08:31:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-21 08:31:14 +0200 |
| commit | 8840168fc568b88a7beb8fd83075a5e45174642d (patch) | |
| tree | d592f1382573abf796716ced5cfd3369c766fff1 | |
| parent | 95009e0a414db61f5f6e1b2bf5f7048d35907f49 (diff) | |
Revert "QmlDesigner: bug fix for components"v2.3.1
Fix wasn't fixing anything, the slash is not in libraryPath but
in the string that is appended to it.
This reverts commit 95009e0a414db61f5f6e1b2bf5f7048d35907f49.
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |