From 9cf61af1e350f0a7c3bbbec8365fef308f934f9b Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 4 Aug 2010 16:58:12 +0200 Subject: Update S60 header pathes * Update list of S60 header pathes to match up with what is put into the Makefile by QMake (minus ../tmp directories). (cherry picked from commit 0aea1325742487bb4b06d617b0b70c1da18a8ab9) --- .../qt4projectmanager/qt-s60/s60devices.cpp | 32 ++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp index 087b621946..ff4d540511 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp @@ -524,25 +524,41 @@ QList S60ToolChainMixin::epocHeaderPaths() const rc << ProjectExplorer::HeaderPath(epocRootPath, ProjectExplorer::HeaderPath::GlobalHeaderPath) + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("include"), + ProjectExplorer::HeaderPath::GlobalHeaderPath) + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("mkspecs/common/symbian"), + ProjectExplorer::HeaderPath::GlobalHeaderPath) + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include"), + ProjectExplorer::HeaderPath::GlobalHeaderPath) + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions/stdapis"), + ProjectExplorer::HeaderPath::GlobalHeaderPath) + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions/stdapis/sys"), + ProjectExplorer::HeaderPath::GlobalHeaderPath) << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis"), ProjectExplorer::HeaderPath::GlobalHeaderPath) << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis/sys"), ProjectExplorer::HeaderPath::GlobalHeaderPath) - << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis/stlportv5"), + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions/stdapis/stlport"), + ProjectExplorer::HeaderPath::GlobalHeaderPath) + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/stdapis/stlport"), + ProjectExplorer::HeaderPath::GlobalHeaderPath) + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/oem"), + ProjectExplorer::HeaderPath::GlobalHeaderPath) + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/middleware"), ProjectExplorer::HeaderPath::GlobalHeaderPath) - << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/mw"), + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/middleware"), ProjectExplorer::HeaderPath::GlobalHeaderPath) - << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/mw"), + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/osextensions"), ProjectExplorer::HeaderPath::GlobalHeaderPath) - << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform"), + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/osextensions"), ProjectExplorer::HeaderPath::GlobalHeaderPath) - << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/loc"), + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/osextensions/loc"), ProjectExplorer::HeaderPath::GlobalHeaderPath) - << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/mw/loc"), + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/middleware/loc"), ProjectExplorer::HeaderPath::GlobalHeaderPath) - << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/loc/sc"), + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/osextensions/loc/sc"), ProjectExplorer::HeaderPath::GlobalHeaderPath) - << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/platform/mw/loc/sc"), + << ProjectExplorer::HeaderPath(epocRootPath + QLatin1String("epoc32/include/domain/middleware/loc/sc"), ProjectExplorer::HeaderPath::GlobalHeaderPath); return rc; } -- cgit v1.2.3