aboutsummaryrefslogtreecommitdiffstats
path: root/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp')
-rw-r--r--src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
index 8a982f5cdd..26999ef2a2 100644
--- a/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -581,7 +581,7 @@ void ObjectNodeInstance::refreshProperty(const PropertyName &name)
if (oldValue.type() == QVariant::Url) {
QByteArray key = oldValue.toUrl().toEncoded(QUrl::UrlFormattingOption(0x100));
- QString pixmapKey = QString::fromUtf8(key.constData(), key.count());
+ QString pixmapKey = QString::fromUtf8(key.constData(), key.size());
QPixmapCache::remove(pixmapKey);
}
@@ -851,7 +851,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::Qml2ImportsPath) + relativeImportPath;
+ QString fixedComponentPath = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath) + relativeImportPath;
fixedComponentPath.replace(QLatin1Char('\\'), QLatin1Char('/'));
if (QFileInfo::exists(fixedComponentPath))
return fixedComponentPath;