diff options
| author | axis <qt-info@nokia.com> | 2010-01-21 12:20:33 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-01-21 12:20:33 (GMT) |
| commit | 833bea1f71ed685e5f371d93f6f5c2da7be546e5 (patch) | |
| tree | 09e3f60311ebf8af123a9e61f27908dd87118109 /mkspecs/symbian-sbsv2 | |
| parent | d609f7d1963e06d05fa6f7e4a098a304a177bc68 (diff) | |
| parent | d83e82e5c8a7fa0f6b1dcc4b1ab56f22afd942f6 (diff) | |
| download | Qt-833bea1f71ed685e5f371d93f6f5c2da7be546e5.zip Qt-833bea1f71ed685e5f371d93f6f5c2da7be546e5.tar.gz Qt-833bea1f71ed685e5f371d93f6f5c2da7be546e5.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
mkspecs/features/symbian/platform_paths.prf
Diffstat (limited to 'mkspecs/symbian-sbsv2')
5 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm index b4f39f5..3defe30 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm @@ -1,6 +1,6 @@ # /**************************************************************************** # ** -# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +# ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). # ** Contact: Nokia Corporation (qt-info@nokia.com) # ** # ** This file is part of symbian-sbsv2 mkspec. diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm index cc57bf4..79ab8cb 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm @@ -1,6 +1,6 @@ # /**************************************************************************** # ** -# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +# ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). # ** Contact: Nokia Corporation (qt-info@nokia.com) # ** # ** This file is part of symbian-sbsv2 mkspec. diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm index a3e0f4a..8ad89e7 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm @@ -1,6 +1,6 @@ # /**************************************************************************** # ** -# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +# ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). # ** Contact: Nokia Corporation (qt-info@nokia.com) # ** # ** This file is part of symbian-sbsv2 mkspec. diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm index 634fafa..d952f8f 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm @@ -1,6 +1,6 @@ # /**************************************************************************** # ** -# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +# ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). # ** Contact: Nokia Corporation (qt-info@nokia.com) # ** # ** This file is part of symbian-sbsv2 mkspec. diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml index c99b5e2..904f113 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml +++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml @@ -2,7 +2,7 @@ <!-- # /**************************************************************************** # ** -# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +# ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). # ** Contact: Nokia Corporation (qt-info@nokia.com) # ** # ** This file is part of symbian-sbsv2 mkspec. |