Merge commit 'origin/master' into symbolVisibility

9 files changed, 18 insertions, 14 deletions

diff --git a/mkspecs/common/symbian/fixed_stdlib.h b/mkspecs/common/symbian/fixed_stdlib.h
index 82ad45d..f8dc138 100644
--- a/mkspecs/common/symbian/fixed_stdlib.h
+++ b/mkspecs/common/symbian/fixed_stdlib.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -49,16 +49,16 @@
 // If _WCHAR_T_DECLARED is defined, undef it and store information that we
 // need to revert the _WCHAR_T_DECLARED define after include
 #   ifdef _WCHAR_T_DECLARED
-#       define REVERT_WCHAR_T_DECLARED
+#       define QT_REVERT_WCHAR_T_DECLARED
 #       undef _WCHAR_T_DECLARED
 #   endif //_WCHAR_T_DECLARED
 
 #include <stdlib.h>
 
 // Revert _WCHAR_T_DECLARED if necessary
-#   ifdef REVERT_WCHAR_T_DECLARED
+#   ifdef QT_REVERT_WCHAR_T_DECLARED
 #       define _WCHAR_T_DECLARED
-#       undef REVERT_WCHAR_T_DECLARED
-#   endif //REVERT_WCHAR_T_DECLARED
+#       undef QT_REVERT_WCHAR_T_DECLARED
+#   endif //QT_REVERT_WCHAR_T_DECLARED
 
 #endif
diff --git a/mkspecs/common/symbian/qplatformdefs.h b/mkspecs/common/symbian/qplatformdefs.h
index db5f461..b459cef 100644
--- a/mkspecs/common/symbian/qplatformdefs.h
+++ b/mkspecs/common/symbian/qplatformdefs.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/mkspecs/common/symbian/stl-off/new b/mkspecs/common/symbian/stl-off/new
index 3939e11..8584ba3 100644
--- a/mkspecs/common/symbian/stl-off/new
+++ b/mkspecs/common/symbian/stl-off/new
@@ -1,4 +1,4 @@
-// new implemented in symbian libs, do nothing here, just keep Qt happpy
+// 'new' implemented in symbian libs, so do nothing here; just keep Qt happy
 #ifndef __NEW_SYMB_ADDON
 #define __NEW_SYMB_ADDON
 #include <e32base.h>
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index ae58c5d..4ab5ac2 100644
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -6,7 +6,6 @@ qtAddLibrary(QtTest)
 symbian:{
 # qt.prf sets TARGET.EPOCSTACKSIZE and TARGET.EPOCHEAPSIZE
 #    DEFINES += QTEST_NO_SPECIALIZATIONS
-    TARGET.UID3 = $$generate_test_uid($$TARGET)
     TARGET.CAPABILITY="ALL -TCB"
     RSS_RULES ="group_name=\"QtTests\";" 
 }
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index df4bb1c..97b99a5 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -13,8 +13,8 @@ contains( CONFIG, no_icon ) {
             message("ICON keyword must have one or the same amout of items as in TRANSLATIONS keyword")
         }
 
-        # MIF files will have UID in their names, if TARGET.UID3 is not set we need to generate it
-        isEmpty(TARGET.UID3):TARGET.UID3 = $$generate_test_uid($$TARGET)
+        # MIF files will have UID in their names, if TARGET.UID3 is not set, remind the user
+        isEmpty(TARGET.UID3):error("TARGET.UID3 must be explicitly defined for ICON generation")
 
         # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
         symbian-abld {        
diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf
index db2ea14..dd4a4d5 100644
--- a/mkspecs/features/symbian/qt.prf
+++ b/mkspecs/features/symbian/qt.prf
@@ -6,6 +6,9 @@ CONFIG += qtmain
 
 load(qt)
 
+# Add dependency to QtLibs package to all other projects besides QtLibs.
+# Note: QtLibs with full capabilities has UID3 of 0x2001E61C, 
+#       while self-signed version typically has temporary UID3 of 0xE001E61C. 
 contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) {
     default_deployment.pkg_prerules += \
         "; Default dependency to Qt libraries" \
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf
index 9eb6b86..c885bb7 100644
--- a/mkspecs/features/symbian/stl.prf
+++ b/mkspecs/features/symbian/stl.prf
@@ -1,14 +1,15 @@
 CONFIG -= stl_off
 
-# STL usage in S60 requires the following mmp variables to be uses
+# STL usage in S60 requires the following mmp variables to be used.
+# These are added via $$STLLIB_USAGE_CW_FLAGS and $$STLLIB_USAGE_DEFINES
+# variables below.
 # OPTION CW -wchar_t on
 # MACRO  _WCHAR_T_DECLARED
 
 QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS 
 DEFINES *= $$STLLIB_USAGE_DEFINES
 
-# Legacy support requires some hardcoded stdapis paths.
-# Note: Also the new header is used from STL when it is enabled
+# Path to stlport headers
 INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE 
 
 # Remove mkspecs/common/symbian/stl-off from beginning of includepath 
diff --git a/mkspecs/features/win32/rtti_off.prf b/mkspecs/features/win32/rtti_off.prf
index 8f175de..b520bfa 100644
--- a/mkspecs/features/win32/rtti_off.prf
+++ b/mkspecs/features/win32/rtti_off.prf
@@ -1,3 +1,4 @@
 CONFIG -= rtti
 QMAKE_CFLAGS += $$QMAKE_CFLAGS_RTTI_OFF
 QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RTTI_OFF
+DEFINES += QT_NO_DYNAMIC_CAST
\ No newline at end of file
diff --git a/mkspecs/win32-mwc/qplatformdefs.h b/mkspecs/win32-mwc/qplatformdefs.h
index 5c31394..a96b4db 100644
--- a/mkspecs/win32-mwc/qplatformdefs.h
+++ b/mkspecs/win32-mwc/qplatformdefs.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/