diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-06-16 13:43:01 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-06-16 13:49:52 (GMT) |
| commit | 5612a8c81bc1b0bbaf1e35ef21099124f18eec7e (patch) | |
| tree | b28448068d8f2e3f39a0213a7930915cd2e594e0 /mkspecs/features/symbian | |
| parent | 186d66f01e0e489219e82ea732868a0520dc241b (diff) | |
| download | Qt-5612a8c81bc1b0bbaf1e35ef21099124f18eec7e.zip Qt-5612a8c81bc1b0bbaf1e35ef21099124f18eec7e.tar.gz Qt-5612a8c81bc1b0bbaf1e35ef21099124f18eec7e.tar.bz2 | |
Fix detection of stlportv5.
Using two concatenated variables as an argument to exists() causes
problems because this can expand to '//' which qmake thinks is a valid
path (if at the beginning), but this is not what we want here. So add
a work around to manually expand the path without the additional '/'
character and then add a comment saying that changing one should change
the other.
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'mkspecs/features/symbian')
| -rw-r--r-- | mkspecs/features/symbian/platform_paths.prf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf index 419982d..1e62c41 100644 --- a/mkspecs/features/symbian/platform_paths.prf +++ b/mkspecs/features/symbian/platform_paths.prf @@ -112,6 +112,7 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) { defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) { return (/epoc32/include/$$1) } + # WARNING: If the following path changes see the exists() function around line 219 defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) { return (/epoc32/include/$$1) } @@ -215,7 +216,7 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) { OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl) # stlportv5 is preferred over stlport as it has the throwing version of operator new - exists($${EPOCROOT}$$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5)) { + exists($${EPOCROOT}epoc32/include/stdapis/stlportv5)) { OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5) } else { OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlport) @@ -308,6 +309,7 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) { defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) { return (/epoc32/include/osextensions/$$1) } + # WARNING: If the following path changes see the exists() function around line 430 defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) { return (/epoc32/include/osextensions/$$1) } @@ -425,7 +427,7 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) { /epoc32/include/stdapis/openssl # stlportv5 is preferred over stlport as it has the throwing version of operator new - exists($${EPOCROOT}$$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5))|exists($${EPOCROOT}epoc32/include/stdapis/stlportv5) { + exists($${EPOCROOT}epoc32/include/osextensions/stdapis/stlportv5)|exists($${EPOCROOT}epoc32/include/stdapis/stlportv5) { OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5) \ /epoc32/include/stdapis/stlportv5 } else { |