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:
9 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:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
Note: See TracChangeset for help on using the changeset viewer.