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

Revert "QmlDesigner: bug fix for components"

Browse Source 
Fix wasn't fixing anything, the slash is not in libraryPath but
in the string that is appended to it.

This reverts commit 95009e0a41.
This commit is contained in:
Eike Ziller
2011-09-21 08:31:14 +02:00
parent 95009e0a41
commit 8840168fc5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
View File

@@ -804,7 +804,7 @@ static inline QString fixComponentPathForIncompatibleQt(const QString &component
if (componentPath.contains(importString)) { if (componentPath.contains(importString)) {
int index = componentPath.indexOf(importString) + 8; int index = componentPath.indexOf(importString) + 8;
const QString relativeImportPath = componentPath.right(componentPath.length() - index); 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('/')); fixedComponentPath.replace(QLatin1Char('\\'), QLatin1Char('/'));
if (QFileInfo(fixedComponentPath).exists()) if (QFileInfo(fixedComponentPath).exists())
return fixedComponentPath; return fixedComponentPath;