Changeset 561 for trunk/tools/installer


Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/tools/installer/batch/build.bat

    r2 r561  
    22::
    33:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 :: Contact: Qt Software Information (qt-info@nokia.com)
     4:: All rights reserved.
     5:: Contact: Nokia Corporation (qt-info@nokia.com)
    56::
    67:: This file is part of the tools applications of the Qt Toolkit.
     
    2122:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223::
    23 :: In addition, as a special exception, Nokia gives you certain
    24 :: additional rights. These rights are described in the Nokia Qt LGPL
    25 :: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 :: package.
     24:: In addition, as a special exception, Nokia gives you certain additional
     25:: rights.  These rights are described in the Nokia Qt LGPL Exception
     26:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727::
    2828:: GNU General Public License Usage
     
    3434:: met: http://www.gnu.org/copyleft/gpl.html.
    3535::
    36 :: If you are unsure which license is appropriate for your use, please
    37 :: contact the sales department at qt-sales@nokia.com.
     36:: If you have questions regarding the use of this file, please contact
     37:: Nokia at qt-info@nokia.com.
    3838:: $QT_END_LICENSE$
    39 ::
    40 :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 :: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239::
    4340:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  • trunk/tools/installer/batch/copy.bat

    r2 r561  
    22::
    33:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 :: Contact: Qt Software Information (qt-info@nokia.com)
     4:: All rights reserved.
     5:: Contact: Nokia Corporation (qt-info@nokia.com)
    56::
    67:: This file is part of the tools applications of the Qt Toolkit.
     
    2122:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223::
    23 :: In addition, as a special exception, Nokia gives you certain
    24 :: additional rights. These rights are described in the Nokia Qt LGPL
    25 :: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 :: package.
     24:: In addition, as a special exception, Nokia gives you certain additional
     25:: rights.  These rights are described in the Nokia Qt LGPL Exception
     26:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727::
    2828:: GNU General Public License Usage
     
    3434:: met: http://www.gnu.org/copyleft/gpl.html.
    3535::
    36 :: If you are unsure which license is appropriate for your use, please
    37 :: contact the sales department at qt-sales@nokia.com.
     36:: If you have questions regarding the use of this file, please contact
     37:: Nokia at qt-info@nokia.com.
    3838:: $QT_END_LICENSE$
    39 ::
    40 :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 :: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239::
    4340:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  • trunk/tools/installer/batch/delete.bat

    r2 r561  
    22::
    33:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 :: Contact: Qt Software Information (qt-info@nokia.com)
     4:: All rights reserved.
     5:: Contact: Nokia Corporation (qt-info@nokia.com)
    56::
    67:: This file is part of the tools applications of the Qt Toolkit.
     
    2122:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223::
    23 :: In addition, as a special exception, Nokia gives you certain
    24 :: additional rights. These rights are described in the Nokia Qt LGPL
    25 :: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 :: package.
     24:: In addition, as a special exception, Nokia gives you certain additional
     25:: rights.  These rights are described in the Nokia Qt LGPL Exception
     26:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727::
    2828:: GNU General Public License Usage
     
    3434:: met: http://www.gnu.org/copyleft/gpl.html.
    3535::
    36 :: If you are unsure which license is appropriate for your use, please
    37 :: contact the sales department at qt-sales@nokia.com.
     36:: If you have questions regarding the use of this file, please contact
     37:: Nokia at qt-info@nokia.com.
    3838:: $QT_END_LICENSE$
    39 ::
    40 :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 :: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239::
    4340:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  • trunk/tools/installer/batch/env.bat

    r2 r561  
    22::
    33:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 :: Contact: Qt Software Information (qt-info@nokia.com)
     4:: All rights reserved.
     5:: Contact: Nokia Corporation (qt-info@nokia.com)
    56::
    67:: This file is part of the tools applications of the Qt Toolkit.
     
    2122:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223::
    23 :: In addition, as a special exception, Nokia gives you certain
    24 :: additional rights. These rights are described in the Nokia Qt LGPL
    25 :: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 :: package.
     24:: In addition, as a special exception, Nokia gives you certain additional
     25:: rights.  These rights are described in the Nokia Qt LGPL Exception
     26:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727::
    2828:: GNU General Public License Usage
     
    3434:: met: http://www.gnu.org/copyleft/gpl.html.
    3535::
    36 :: If you are unsure which license is appropriate for your use, please
    37 :: contact the sales department at qt-sales@nokia.com.
     36:: If you have questions regarding the use of this file, please contact
     37:: Nokia at qt-info@nokia.com.
    3838:: $QT_END_LICENSE$
    39 ::
    40 :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 :: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239::
    4340:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  • trunk/tools/installer/batch/extract.bat

    r2 r561  
    22::
    33:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 :: Contact: Qt Software Information (qt-info@nokia.com)
     4:: All rights reserved.
     5:: Contact: Nokia Corporation (qt-info@nokia.com)
    56::
    67:: This file is part of the tools applications of the Qt Toolkit.
     
    2122:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223::
    23 :: In addition, as a special exception, Nokia gives you certain
    24 :: additional rights. These rights are described in the Nokia Qt LGPL
    25 :: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 :: package.
     24:: In addition, as a special exception, Nokia gives you certain additional
     25:: rights.  These rights are described in the Nokia Qt LGPL Exception
     26:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727::
    2828:: GNU General Public License Usage
     
    3434:: met: http://www.gnu.org/copyleft/gpl.html.
    3535::
    36 :: If you are unsure which license is appropriate for your use, please
    37 :: contact the sales department at qt-sales@nokia.com.
     36:: If you have questions regarding the use of this file, please contact
     37:: Nokia at qt-info@nokia.com.
    3838:: $QT_END_LICENSE$
    39 ::
    40 :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 :: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239::
    4340:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  • trunk/tools/installer/batch/installer.bat

    r2 r561  
    22::
    33:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 :: Contact: Qt Software Information (qt-info@nokia.com)
     4:: All rights reserved.
     5:: Contact: Nokia Corporation (qt-info@nokia.com)
    56::
    67:: This file is part of the tools applications of the Qt Toolkit.
     
    2122:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223::
    23 :: In addition, as a special exception, Nokia gives you certain
    24 :: additional rights. These rights are described in the Nokia Qt LGPL
    25 :: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 :: package.
     24:: In addition, as a special exception, Nokia gives you certain additional
     25:: rights.  These rights are described in the Nokia Qt LGPL Exception
     26:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727::
    2828:: GNU General Public License Usage
     
    3434:: met: http://www.gnu.org/copyleft/gpl.html.
    3535::
    36 :: If you are unsure which license is appropriate for your use, please
    37 :: contact the sales department at qt-sales@nokia.com.
     36:: If you have questions regarding the use of this file, please contact
     37:: Nokia at qt-info@nokia.com.
    3838:: $QT_END_LICENSE$
    39 ::
    40 :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 :: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239::
    4340:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  • trunk/tools/installer/batch/log.bat

    r2 r561  
    22::
    33:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 :: Contact: Qt Software Information (qt-info@nokia.com)
     4:: All rights reserved.
     5:: Contact: Nokia Corporation (qt-info@nokia.com)
    56::
    67:: This file is part of the tools applications of the Qt Toolkit.
     
    2122:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223::
    23 :: In addition, as a special exception, Nokia gives you certain
    24 :: additional rights. These rights are described in the Nokia Qt LGPL
    25 :: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 :: package.
     24:: In addition, as a special exception, Nokia gives you certain additional
     25:: rights.  These rights are described in the Nokia Qt LGPL Exception
     26:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727::
    2828:: GNU General Public License Usage
     
    3434:: met: http://www.gnu.org/copyleft/gpl.html.
    3535::
    36 :: If you are unsure which license is appropriate for your use, please
    37 :: contact the sales department at qt-sales@nokia.com.
     36:: If you have questions regarding the use of this file, please contact
     37:: Nokia at qt-info@nokia.com.
    3838:: $QT_END_LICENSE$
    39 ::
    40 :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 :: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239::
    4340:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  • trunk/tools/installer/batch/toupper.bat

    r2 r561  
    22::
    33:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 :: Contact: Qt Software Information (qt-info@nokia.com)
     4:: All rights reserved.
     5:: Contact: Nokia Corporation (qt-info@nokia.com)
    56::
    67:: This file is part of the tools applications of the Qt Toolkit.
     
    2122:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223::
    23 :: In addition, as a special exception, Nokia gives you certain
    24 :: additional rights. These rights are described in the Nokia Qt LGPL
    25 :: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 :: package.
     24:: In addition, as a special exception, Nokia gives you certain additional
     25:: rights.  These rights are described in the Nokia Qt LGPL Exception
     26:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727::
    2828:: GNU General Public License Usage
     
    3434:: met: http://www.gnu.org/copyleft/gpl.html.
    3535::
    36 :: If you are unsure which license is appropriate for your use, please
    37 :: contact the sales department at qt-sales@nokia.com.
     36:: If you have questions regarding the use of this file, please contact
     37:: Nokia at qt-info@nokia.com.
    3838:: $QT_END_LICENSE$
    39 ::
    40 :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 :: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239::
    4340:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  • trunk/tools/installer/config/config.default.sample

    r2 r561  
    22##
    33## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ## Contact: Qt Software Information (qt-info@nokia.com)
     4## All rights reserved.
     5## Contact: Nokia Corporation (qt-info@nokia.com)
    56##
    67## This file is part of the tools applications of the Qt Toolkit.
     
    2122## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223##
    23 ## In addition, as a special exception, Nokia gives you certain
    24 ## additional rights. These rights are described in the Nokia Qt LGPL
    25 ## Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ## package.
     24## In addition, as a special exception, Nokia gives you certain additional
     25## rights.  These rights are described in the Nokia Qt LGPL Exception
     26## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727##
    2828## GNU General Public License Usage
     
    3434## met: http://www.gnu.org/copyleft/gpl.html.
    3535##
    36 ## If you are unsure which license is appropriate for your use, please
    37 ## contact the sales department at qt-sales@nokia.com.
     36## If you have questions regarding the use of this file, please contact
     37## Nokia at qt-info@nokia.com.
    3838## $QT_END_LICENSE$
    39 ##
    40 ## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239##
    4340#############################################################################
  • trunk/tools/installer/config/mingw-opensource.conf

    r2 r561  
    22##
    33## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ## Contact: Qt Software Information (qt-info@nokia.com)
     4## All rights reserved.
     5## Contact: Nokia Corporation (qt-info@nokia.com)
    56##
    67## This file is part of the tools applications of the Qt Toolkit.
     
    2122## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223##
    23 ## In addition, as a special exception, Nokia gives you certain
    24 ## additional rights. These rights are described in the Nokia Qt LGPL
    25 ## Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ## package.
     24## In addition, as a special exception, Nokia gives you certain additional
     25## rights.  These rights are described in the Nokia Qt LGPL Exception
     26## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727##
    2828## GNU General Public License Usage
     
    3434## met: http://www.gnu.org/copyleft/gpl.html.
    3535##
    36 ## If you are unsure which license is appropriate for your use, please
    37 ## contact the sales department at qt-sales@nokia.com.
     36## If you have questions regarding the use of this file, please contact
     37## Nokia at qt-info@nokia.com.
    3838## $QT_END_LICENSE$
    39 ##
    40 ## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239##
    4340#############################################################################
     
    4643#extract     dest               "build_mingw_opensource"
    4744#Section EXTRACT
    48 #extract     extUnpack          "qt-win-opensource-src-4.5.1.zip"
     45#extract     extUnpack          "qt-win-opensource-src-4.6.1.zip"
    4946#SectionEnd
    5047
  • trunk/tools/installer/iwmake.bat

    r2 r561  
    22::
    33:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 :: Contact: Qt Software Information (qt-info@nokia.com)
     4:: All rights reserved.
     5:: Contact: Nokia Corporation (qt-info@nokia.com)
    56::
    67:: This file is part of the tools applications of the Qt Toolkit.
     
    2122:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223::
    23 :: In addition, as a special exception, Nokia gives you certain
    24 :: additional rights. These rights are described in the Nokia Qt LGPL
    25 :: Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 :: package.
     24:: In addition, as a special exception, Nokia gives you certain additional
     25:: rights.  These rights are described in the Nokia Qt LGPL Exception
     26:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727::
    2828:: GNU General Public License Usage
     
    3434:: met: http://www.gnu.org/copyleft/gpl.html.
    3535::
    36 :: If you are unsure which license is appropriate for your use, please
    37 :: contact the sales department at qt-sales@nokia.com.
     36:: If you have questions regarding the use of this file, please contact
     37:: Nokia at qt-info@nokia.com.
    3838:: $QT_END_LICENSE$
    39 ::
    40 :: This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 :: WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239::
    4340:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
  • trunk/tools/installer/nsis/confirmpage.ini

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/gwdownload.ini

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/gwmirror.ini

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/includes/global.nsh

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/includes/instdir.nsh

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/includes/list.nsh

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/includes/qtcommon.nsh

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     
    7269!insertmacro MakeQtDirectory ""
    7370!insertmacro MakeQtDirectory "un."
    74 
    75 Function DeleteFloatingLicenseProgram
    76   exch $1
    77   push $0
    78  
    79   StrCmp $LICENSE_KEY "" end
    80 
    81   ClearErrors
    82   !ifndef OPENSOURCE_BUILD
    83   qtnsisext::IsFloatingLicense $LICENSE_KEY
    84   !endif
    85   IfErrors end
    86   pop $0
    87  
    88   StrCmp $0 "1" end
    89     IfFileExists "$1\bin\qtusagereporter.exe" 0 end
    90       Delete "$1\bin\qtusagereporter.exe"
    91 
    92   end:
    93   pop $0
    94   pop $1
    95 FunctionEnd
    9671
    9772Function AddStartmenuApplication
  • trunk/tools/installer/nsis/includes/qtenv.nsh

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/includes/system.nsh

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/installer.nsi

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     
    4845
    4946!define PRODUCT_PUBLISHER "Nokia Corporation and/or its subsidiary(-ies)"
    50 !define PRODUCT_WEB_SITE "http://qtsoftware.com"
     47!define PRODUCT_WEB_SITE "http://qt.nokia.com"
    5148
    5249!define INSTALL_ICON "images\install.ico"
     
    215212
    216213  WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
    217   CreateShortCut "$SMPROGRAMS\$STARTMENU_STRING\QtSoftware.com.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
     214  CreateShortCut "$SMPROGRAMS\$STARTMENU_STRING\qt.nokia.com.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
    218215  CreateShortCut "$SMPROGRAMS\$STARTMENU_STRING\Uninstall ${PRODUCT_NAME} ${PRODUCT_VERSION}.lnk" "$INSTDIR\uninst.exe"
    219216  SetOutPath "$INSTDIR"
     
    406403  Delete "$INSTDIR\uninst.exe"
    407404  Delete "$SMPROGRAMS\$STARTMENU_STRING\Uninstall ${PRODUCT_NAME} ${PRODUCT_VERSION}.lnk"
    408   Delete "$SMPROGRAMS\$STARTMENU_STRING\QtSoftware.com.lnk"
     405  Delete "$SMPROGRAMS\$STARTMENU_STRING\qt.nokia.com.lnk"
    409406
    410407  RMDir "$SMPROGRAMS\$STARTMENU_STRING"
  • trunk/tools/installer/nsis/modules/environment.nsh

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/modules/mingw.nsh

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     
    5855!endif
    5956!ifndef MODULE_MINGW_URL
    60   !define MODULE_MINGW_URL "ftp://ftp.trolltech.com/misc"
     57  !define MODULE_MINGW_URL "ftp://ftp.qt.nokia.com/misc"
    6158!endif
    6259!ifndef MODULE_MINGW_COMPILERVERSION
     
    108105  !insertmacro MODULE_MINGW_INSTALLFILES
    109106 
    110   push "$MINGW_INSTDIR"
    111   call DeleteFloatingLicenseProgram
    112 
    113107  push "$MINGW_INSTDIR\bin"
    114108  call AddStartmenuApplication
  • trunk/tools/installer/nsis/modules/opensource.nsh

    r2 r561  
    1 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    21;;
    32;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     3;; All rights reserved.
     4;; Contact: Nokia Corporation (qt-info@nokia.com)
    55;;
    66;; This file is part of the tools applications of the Qt Toolkit.
     
    2121;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2222;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     23;; In addition, as a special exception, Nokia gives you certain additional
     24;; rights.  These rights are described in the Nokia Qt LGPL Exception
     25;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2726;;
    2827;; GNU General Public License Usage
     
    3433;; met: http://www.gnu.org/copyleft/gpl.html.
    3534;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     35;; If you have questions regarding the use of this file, please contact
     36;; Nokia at qt-info@nokia.com.
    3837;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4238;;
    4339;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/modules/registeruiext.nsh

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  • trunk/tools/installer/nsis/opensource.ini

    r2 r561  
    22;;
    33;; Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ;; Contact: Qt Software Information (qt-info@nokia.com)
     4;; All rights reserved.
     5;; Contact: Nokia Corporation (qt-info@nokia.com)
    56;;
    67;; This file is part of the tools applications of the Qt Toolkit.
     
    2122;; will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223;;
    23 ;; In addition, as a special exception, Nokia gives you certain
    24 ;; additional rights. These rights are described in the Nokia Qt LGPL
    25 ;; Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ;; package.
     24;; In addition, as a special exception, Nokia gives you certain additional
     25;; rights.  These rights are described in the Nokia Qt LGPL Exception
     26;; version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727;;
    2828;; GNU General Public License Usage
     
    3434;; met: http://www.gnu.org/copyleft/gpl.html.
    3535;;
    36 ;; If you are unsure which license is appropriate for your use, please
    37 ;; contact the sales department at qt-sales@nokia.com.
     36;; If you have questions regarding the use of this file, please contact
     37;; Nokia at qt-info@nokia.com.
    3838;; $QT_END_LICENSE$
    39 ;;
    40 ;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
    41 ;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
    4239;;
    4340;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     
    5653[Field 2]
    5754Type=Link
    58 Text=http://qtsoftware.com/developer/downloads/qt
    59 State=http://qtsoftware.com/developer/downloads/qt
     55Text=http://qt.nokia.com/downloads
     56State=http://qt.nokia.com/downloads
    6057Left=0
    6158Right=278
     
    6562[Field 3]
    6663Type=Link
    67 Text=http://qtsoftware.com/company/model
    68 State=http://qtsoftware.com/company/model
     64Text=http://qt.nokia.com/about
     65State=http://qt.nokia.com/about
    6966Left=0
    7067Right=267
     
    7471[Field 4]
    7572Type=Label
    76 Text=To read more about Nokia/Qt Software's licensing, please go to:
     73Text=To read more about Nokia's licensing, please go to:
    7774Left=0
    7875Right=278
Note: See TracChangeset for help on using the changeset viewer.