diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-09-19 15:31:13 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-19 17:15:13 +0200 |
| commit | 95009e0a414db61f5f6e1b2bf5f7048d35907f49 (patch) | |
| tree | fe7bb4a5ae6656d272b4d38f168dda8b151708d8 | |
| parent | f184ced2e1bbacc244392fe97230bfd9cc07099d (diff) | |
QmlDesigner: bug fix for components
QLibraryInfo::location(QLibraryInfo::ImportsPath) might miss the '/'
at the end.
Change-Id: I552cef7efce7644fad82247850d8853c72edd0ea
Reviewed-on: http://codereview.qt-project.org/5150
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| -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 932f22e415..733e73ec2d 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) + relativeImportPath; + QString fixedComponentPath = QLibraryInfo::location(QLibraryInfo::ImportsPath) + QLatin1Char('/') + relativeImportPath; fixedComponentPath.replace(QLatin1Char('\\'), QLatin1Char('/')); if (QFileInfo(fixedComponentPath).exists()) return fixedComponentPath; |