Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/xmlpatterns/parser/TokenLookup.gperf

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/createParser.sh

    r651 r846  
    22#############################################################################
    33##
    4 ## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4## Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55## All rights reserved.
    66## Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/createTokenLookup.sh

    r651 r846  
    22#############################################################################
    33##
    4 ## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4## Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55## All rights reserved.
    66## Contact: Nokia Corporation ([email protected])
     
    4646/****************************************************************************
    4747**
    48 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     48** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    4949** All rights reserved.
    5050** Contact: Nokia Corporation ([email protected])
     
    5353**
    5454** \\$QT_BEGIN_LICENSE:LGPL\\$
    55 ** No Commercial Usage
    56 ** This file contains pre-release code and may not be distributed.
    57 ** You may use this file in accordance with the terms and conditions
    58 ** contained in the either Technology Preview License Agreement or the
    59 ** Beta Release License Agreement.
     55** Commercial Usage
     56**
     57**
     58**
     59** .
    6060**
    6161** GNU Lesser General Public License Usage
     
    6767** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    6868**
    69 ** In addition, as a special exception, Nokia gives you certain
    70 ** additional rights. These rights are described in the Nokia Qt LGPL
    71 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    72 ** package.
     69** In addition, as a special exception, Nokia gives you certain additional
     70** rights.  These rights are described in the Nokia Qt LGPL Exception
     71** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    7372**
    7473** GNU General Public License Usage
     
    8079** met: http://www.gnu.org/copyleft/gpl.html.
    8180**
    82 ** If you are unsure which license is appropriate for your use, please
    83 ** contact the sales department at http://qt.nokia.com/contact.
     81** If you
     82** .
    8483** \\$QT_END_LICENSE\\$
    8584**
  • trunk/src/xmlpatterns/parser/createXSLTTokenLookup.sh

    r651 r846  
    22#############################################################################
    33##
    4 ## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4## Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    55## All rights reserved.
    66## Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qmaintainingreader.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qmaintainingreader_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qparsercontext.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qparsercontext_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qquerytransformparser.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qquerytransformparser_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qtokenizer_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qtokenlookup.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qtokenrevealer.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qtokenrevealer_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qtokensource.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qtokensource_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/querytransformparser.ypp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
     
    5353/****************************************************************************
    5454**
    55 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     55** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    5656** All rights reserved.
    5757** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qxquerytokenizer.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qxquerytokenizer_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qxslttokenizer.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qxslttokenizer_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qxslttokenlookup.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qxslttokenlookup.xml

    r651 r846  
    111111        <prolog>/****************************************************************************
    112112**
    113 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     113** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    114114** All rights reserved.
    115115** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/qxslttokenlookup_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
  • trunk/src/xmlpatterns/parser/trolltechHeader.txt

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
Note: See TracChangeset for help on using the changeset viewer.