diff --git a/languages/qmljs/libs/qmljs/qmljsinterpreter.cpp b/languages/qmljs/libs/qmljs/qmljsinterpreter.cpp --- a/languages/qmljs/libs/qmljs/qmljsinterpreter.cpp +++ b/languages/qmljs/libs/qmljs/qmljsinterpreter.cpp @@ -336,8 +336,8 @@ propertyFlags |= PropertyInfo::PointerType; else propertyFlags |= PropertyInfo::ValueType; - processor->processProperty(propertyName, valueForCppName(prop.typeName()), - PropertyInfo(propertyFlags)); + processor->processProperty(propertyName, valueForCppName(prop.typeName()), + PropertyInfo(propertyFlags)); // every property always has a onXyzChanged slot, even if the NOTIFY // signal has a different name diff --git a/projectmanagers/custommake/makefileresolver/makefileresolver.cpp b/projectmanagers/custommake/makefileresolver/makefileresolver.cpp --- a/projectmanagers/custommake/makefileresolver/makefileresolver.cpp +++ b/projectmanagers/custommake/makefileresolver/makefileresolver.cpp @@ -367,9 +367,10 @@ else if (workingDirectory.startsWith("./")) workingDirectory = workingDirectory.mid(2); - if (!workingDirectory.isEmpty()) + if (!workingDirectory.isEmpty()) { u = u.adjusted(QUrl::StripTrailingSlash); u.setPath(u.path() + '/' + workingDirectory); + } workingDirectory = u.toLocalFile(); } else workingDirectory = _workingDirectory; @@ -486,9 +487,10 @@ res.includePathDependency = dependency; - if (res.paths.isEmpty()) + if (res.paths.isEmpty()) { res.paths = cachedPaths; //We failed, maybe there is an old cached result, use that. res.defines = cachedDefines; + } { QMutexLocker l(&s_cacheMutex); @@ -745,4 +747,4 @@ } m_stringCache.insert(path); return path; -} \ No newline at end of file +}