Commit 50b70d76 authored by Alessandro Portale's avatar Alessandro Portale
Browse files

Fixed detection of /epoc32/include/stdapis/string.h

It was searched in /include/stdapis/string.h

Added the /epoc32/ as agreed with Tobias.

Reviewed-by: Tobias Hunger
parent 299f2be2
...@@ -197,7 +197,7 @@ void QMakeStep::run(QFutureInterface<bool> &fi) ...@@ -197,7 +197,7 @@ void QMakeStep::run(QFutureInterface<bool> &fi)
const QString projectDir = QDir(qt4BuildConfiguration()->qt4Target()->qt4Project()->projectDirectory()).absolutePath(); const QString projectDir = QDir(qt4BuildConfiguration()->qt4Target()->qt4Project()->projectDirectory()).absolutePath();
const QString epocRootDir = QDir(Internal::S60Manager::instance()->deviceForQtVersion(qtVersion).epocRoot).absolutePath(); const QString epocRootDir = QDir(Internal::S60Manager::instance()->deviceForQtVersion(qtVersion).epocRoot).absolutePath();
QFileInfo cppheader(epocRootDir + QLatin1String("/include/stdapis/string.h")); QFileInfo cppheader(epocRootDir + QLatin1String("/epoc32/include/stdapis/string.h"));
#if defined (Q_OS_WIN) #if defined (Q_OS_WIN)
// Report an error if project- and epoc directory are on different drives: // Report an error if project- and epoc directory are on different drives:
if (!epocRootDir.startsWith(projectDir.left(3))) { if (!epocRootDir.startsWith(projectDir.left(3))) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment