From 50b70d769b75517fd77a0168444c98af9d4c689a Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Thu, 8 Apr 2010 21:36:00 +0200
Subject: [PATCH] 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
---
src/plugins/qt4projectmanager/qmakestep.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index ff7e4edca14..73b681ca308 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -197,7 +197,7 @@ void QMakeStep::run(QFutureInterface<bool> &fi)
const QString projectDir = QDir(qt4BuildConfiguration()->qt4Target()->qt4Project()->projectDirectory()).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)
// Report an error if project- and epoc directory are on different drives:
if (!epocRootDir.startsWith(projectDir.left(3))) {
--
GitLab