diff options
| author | axis <qt-info@nokia.com> | 2010-07-30 07:12:03 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-08-03 07:27:31 (GMT) |
| commit | ee9d985f1a3d7071a83fc025c8b8d163effffbc0 (patch) | |
| tree | bf5de4c15a898af87c35e97add14fa0039d7a565 /mkspecs/features | |
| parent | f937d985e9599c16e72b504c404bc8232787c98e (diff) | |
| download | Qt-ee9d985f1a3d7071a83fc025c8b8d163effffbc0.zip Qt-ee9d985f1a3d7071a83fc025c8b8d163effffbc0.tar.gz Qt-ee9d985f1a3d7071a83fc025c8b8d163effffbc0.tar.bz2 | |
Prevented makefile build system from using platform provided paths.
Platform paths provided by Symbian do not provide the full path to
headers. Ideally they should be used, by looking for and replacing
/epoc32 with the correct path. However, for now this is a good enough
solution.
RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/platform_paths.prf | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf index 5c190c8..f19898f 100644 --- a/mkspecs/features/symbian/platform_paths.prf +++ b/mkspecs/features/symbian/platform_paths.prf @@ -65,8 +65,11 @@ symbian-abld|symbian-sbsv2 { epocroot_prefix = $${EPOCROOT} } -exists($${EPOCROOT}epoc32/include/platform_paths.prf) { - +symbian-abld|symbian-sbsv2:exists($${EPOCROOT}epoc32/include/platform_paths.prf) { + + # Symbian does not provide correct profiles for non-mmp based systems, so + # we only should get in here with abld and sbsv2. + # Load platform specific paths load($${EPOCROOT}epoc32/include/platform_paths.prf) |