More robust handling for stdapis paths

4 files changed, 29 insertions, 24 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 6ae4c4a..663a1df 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -115,10 +115,7 @@ INCLUDEPATH = \
     $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off \
     $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian \
     $${EPOCROOT}epoc32/include \
-    $${EPOCROOT}epoc32/include/stdapis \
-    $${EPOCROOT}epoc32/include/stdapis/sys \
     $$OS_LAYER_LIBC_SYSTEMINCLUDE \
-    $${OS_LAYER_LIBC_SYSTEMINCLUDE}/sys \
     $$INCLUDEPATH
     
 # Supports S60 3.0, 3.1, 3.2 and 5.0 by default
diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf
index c9972cc..419982d 100644
--- a/mkspecs/features/symbian/platform_paths.prf
+++ b/mkspecs/features/symbian/platform_paths.prf
@@ -205,16 +205,17 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # part of stdapis. Append to INCLUDEPATH in pro-file.
         # ---------------------------------------
 
-        OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis)
+        OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/sys)
 
         OS_LAYER_GLIB_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/glib) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/gObject)
 
-
         OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl)
 
-        exists($$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5)) {
+        # stlportv5 is preferred over stlport as it has the throwing version of operator new
+        exists($${EPOCROOT}$$OS_LAYER_PUBLIC_EXPORT_PATH(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)
@@ -408,28 +409,40 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
         # part of stdapis. Append to INCLUDEPATH in pro-file.
         # ---------------------------------------
 
-        OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis)
+        OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis) \
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/sys) \
+                                      /epoc32/include/stdapis \
+                                      /epoc32/include/stdapis/sys
 
         OS_LAYER_GLIB_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0) \
                                       $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/glib) \
-                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/gObject)
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/gObject) \
+                                      /epoc32/include/stdapis/glib-2.0 \
+                                      /epoc32/include/stdapis/glib-2.0/glib \
+                                      /epoc32/include/stdapis/glib-2.0/gObject
 
-
-        OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl)
+        OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl) \
+                                     /epoc32/include/stdapis/openssl
 
         # stlportv5 is preferred over stlport as it has the throwing version of operator new
-        exists($$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5)) {
-            OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5)
+        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) \
+                                            /epoc32/include/stdapis/stlportv5
         } else {
-            OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlport)
+            OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlport) \
+                                            /epoc32/include/stdapis/stlport
         }
-
-        OS_LAYER_BOOST_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/boost)
+        
+        OS_LAYER_BOOST_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/boost) \
+                                       /epoc32/include/stdapis/boost
 
         OS_LAYER_DBUS_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0) \
-                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0/dbus)
+                                      $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0/dbus) \
+                                      /epoc32/include/stdapis/dbus-1.0 \
+                                      /epoc32/include/stdapis/dbus-1.0/dbus
 
-        OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility)
+        OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility) \
+                                            /epoc32/include/stdapis/utility
 
         # ---------------------------------------
         # Definitions to export IBY files to different folders where they will be taken 
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf
index f01cc18..9eb6b86 100644
--- a/mkspecs/features/symbian/stl.prf
+++ b/mkspecs/features/symbian/stl.prf
@@ -9,8 +9,7 @@ DEFINES *= $$STLLIB_USAGE_DEFINES
 
 # Legacy support requires some hardcoded stdapis paths.
 # Note: Also the new header is used from STL when it is enabled
-INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE \
-               $${EPOCROOT}epoc32/include/stdapis/stlport
+INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE 
 
 # Remove mkspecs/common/symbian/stl-off from beginning of includepath 
 # in order to use new and delete operators from STL
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 5427370..6021d5d 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -3,11 +3,7 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
     
 
 symbian {
-	TRY_INCLUDEPATHS = $${EPOCROOT}epoc32/include $${EPOCROOT}epoc32/include/stdapis $${EPOCROOT}epoc32/include/stdapis/sys $$OS_LAYER_LIBC_SYSTEMINCLUDE
-	for(p, TRY_INCLUDEPATHS) {
-		pp = $$join(p, "", "", "/openssl")
-		exists($$pp):INCLUDEPATH *= $$pp
-	}
+	INCLUDEPATH *= $$OS_LAYER_SSL_SYSTEMINCLUDE
 } else {
 	include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri) 
 }