Merge remote-tracking branch 'origin/3.5'

Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
2015-08-04 13:15:51 +02:00
parent b1401173de aa8998cfb3
commit cd5f9f6ff8
203 changed files with 6590 additions and 12601 deletions
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -897,7 +897,9 @@ QString QmakeProject::generatedUiHeader(const FileName &formFile) const
    // the top-level project only.
    if (m_rootProjectNode)
        if (const QmakeProFileNode *pro = proFileNodeOf(m_rootProjectNode, FormType, formFile))
-            return QmakeProFileNode::uiHeaderFile(pro->uiDirectory(pro->buildDir()), formFile);
+            return QmakeProFileNode::uiHeaderFile(
+                        pro->uiDirectory(Utils::FileName::fromString(pro->buildDir())),
+                        formFile);
    return QString();
 }