diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-19 12:50:51 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-19 12:50:51 (GMT) |
| commit | 8b31f3a59f7a7153e6b5b3af0856f660a5d21034 (patch) | |
| tree | fe41de8709e0df1abb8472412932a5c366b9a21e /mkspecs | |
| parent | e7d36a55746e6e3a2a66c47ee85cbfbfbe079c4e (diff) | |
| parent | e843ec2585017978996beb40f0cf84c7b54a20b0 (diff) | |
| download | Qt-8b31f3a59f7a7153e6b5b3af0856f660a5d21034.zip Qt-8b31f3a59f7a7153e6b5b3af0856f660a5d21034.tar.gz Qt-8b31f3a59f7a7153e6b5b3af0856f660a5d21034.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/fixed_stdlib.h | 2 | ||||
| -rw-r--r-- | mkspecs/common/symbian/qplatformdefs.h | 2 | ||||
| -rw-r--r-- | mkspecs/features/win32/rtti_off.prf | 1 | ||||
| -rw-r--r-- | mkspecs/win32-mwc/qplatformdefs.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/fixed_stdlib.h b/mkspecs/common/symbian/fixed_stdlib.h index 82ad45d..a6dcbc7 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$ ** ****************************************************************************/ 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/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$ ** ****************************************************************************/ |