Timestamp:
Nov 7, 2014, 5:23:02 PM (11 years ago)
Author:
Dmitry A. Kuminov
Message:

vendor: Import qt-everywhere-opensource-src-4.8.6 from Digia (excluding doc/html and doc/qch dirs generated from doc/src, and imports and templates dirs which are emtpy).

Location:
branches/vendor/nokia/qt/current/tools/qtconcurrent
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/vendor/nokia/qt/current/tools/qtconcurrent/codegenerator/example/main.cpp

    r844 r1156  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
    5 ** Contact: Nokia Corporation ([email protected])
     3** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    65**
    76** This file is part of the tools applications of the Qt Toolkit.
    87**
    98** $QT_BEGIN_LICENSE:LGPL$
    10 ** Commercial Usage
    11 ** Licensees holding valid Qt Commercial licenses may use this file in
    12 ** accordance with the Qt Commercial License Agreement provided with the
     9** Commercial Usage
     10** Licensees holding valid licenses may use this file in
     11** accordance with the greement provided with the
    1312** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** a written agreement between you and Digia.  For licensing terms and
     14** conditions see http://qt.digia.com/licensing.  For further information
     15** use the contact form at http://qt.digia.com/contact-us.
    1516**
    1617** GNU Lesser General Public License Usage
    … …  
    2223** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2324**
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
     25** In addition, as a special exception, ia gives you certain additional
     26** rights.  These rights are described in the ia Qt LGPL Exception
    2627** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2728**
    … …  
    3435** met: http://www.gnu.org/copyleft/gpl.html.
    3536**
    36 ** If you have questions regarding the use of this file, please contact
    37 ** Nokia at [email protected].
     37**
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/tools/qtconcurrent/codegenerator/src/codegenerator.cpp

    r844 r1156  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
    5 ** Contact: Nokia Corporation ([email protected])
     3** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    65**
    76** This file is part of the tools applications of the Qt Toolkit.
    87**
    98** $QT_BEGIN_LICENSE:LGPL$
    10 ** Commercial Usage
    11 ** Licensees holding valid Qt Commercial licenses may use this file in
    12 ** accordance with the Qt Commercial License Agreement provided with the
     9** Commercial Usage
     10** Licensees holding valid licenses may use this file in
     11** accordance with the greement provided with the
    1312** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** a written agreement between you and Digia.  For licensing terms and
     14** conditions see http://qt.digia.com/licensing.  For further information
     15** use the contact form at http://qt.digia.com/contact-us.
    1516**
    1617** GNU Lesser General Public License Usage
    … …  
    2223** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2324**
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
     25** In addition, as a special exception, ia gives you certain additional
     26** rights.  These rights are described in the ia Qt LGPL Exception
    2627** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2728**
    … …  
    3435** met: http://www.gnu.org/copyleft/gpl.html.
    3536**
    36 ** If you have questions regarding the use of this file, please contact
    37 ** Nokia at [email protected].
     37**
    3838** $QT_END_LICENSE$
    3939**
    … …  
    135135const Compound operator+(const char * const text, const Item &b)
    136136{
    137     return Compound(Text(text), b);   
     137    return Compound(Text(text), b);
    138138}
    139139

  • branches/vendor/nokia/qt/current/tools/qtconcurrent/codegenerator/src/codegenerator.h

    r844 r1156  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
    5 ** Contact: Nokia Corporation ([email protected])
     3** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    65**
    76** This file is part of the tools applications of the Qt Toolkit.
    87**
    98** $QT_BEGIN_LICENSE:LGPL$
    10 ** Commercial Usage
    11 ** Licensees holding valid Qt Commercial licenses may use this file in
    12 ** accordance with the Qt Commercial License Agreement provided with the
     9** Commercial Usage
     10** Licensees holding valid licenses may use this file in
     11** accordance with the greement provided with the
    1312** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** a written agreement between you and Digia.  For licensing terms and
     14** conditions see http://qt.digia.com/licensing.  For further information
     15** use the contact form at http://qt.digia.com/contact-us.
    1516**
    1617** GNU Lesser General Public License Usage
    … …  
    2223** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2324**
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
     25** In addition, as a special exception, ia gives you certain additional
     26** rights.  These rights are described in the ia Qt LGPL Exception
    2627** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2728**
    … …  
    3435** met: http://www.gnu.org/copyleft/gpl.html.
    3536**
    36 ** If you have questions regarding the use of this file, please contact
    37 ** Nokia at [email protected].
     37**
    3838** $QT_END_LICENSE$
    3939**

  • branches/vendor/nokia/qt/current/tools/qtconcurrent/generaterun/main.cpp

    r844 r1156  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    4 ** All rights reserved.
    5 ** Contact: Nokia Corporation ([email protected])
     3** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
     4** Contact: http://www.qt-project.org/legal
    65**
    76** This file is part of the tools applications of the Qt Toolkit.
    87**
    98** $QT_BEGIN_LICENSE:LGPL$
    10 ** Commercial Usage
    11 ** Licensees holding valid Qt Commercial licenses may use this file in
    12 ** accordance with the Qt Commercial License Agreement provided with the
     9** Commercial Usage
     10** Licensees holding valid licenses may use this file in
     11** accordance with the greement provided with the
    1312** Software or, alternatively, in accordance with the terms contained in
    14 ** a written agreement between you and Nokia.
     13** a written agreement between you and Digia.  For licensing terms and
     14** conditions see http://qt.digia.com/licensing.  For further information
     15** use the contact form at http://qt.digia.com/contact-us.
    1516**
    1617** GNU Lesser General Public License Usage
    … …  
    2223** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2324**
    24 ** In addition, as a special exception, Nokia gives you certain additional
    25 ** rights.  These rights are described in the Nokia Qt LGPL Exception
     25** In addition, as a special exception, ia gives you certain additional
     26** rights.  These rights are described in the ia Qt LGPL Exception
    2627** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2728**
    … …  
    3435** met: http://www.gnu.org/copyleft/gpl.html.
    3536**
    36 ** If you have questions regarding the use of this file, please contact
    37 ** Nokia at [email protected].
     37**
    3838** $QT_END_LICENSE$
    3939**
    … …  
    326326                       Line("/****************************************************************************") +
    327327                       Line("**") +
    328                        Line("** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).") +
    329                        Line("** Contact: Nokia Corporation ([email protected])") +
     328                       Line("** Copyright (C) 201 and/or its subsidiary(-ies).") +
     329                       Line("** Contact: ") +
    330330                       Line("**") +
    331331                       Line("** This file is part of the Qt Toolkit.") +
    … …  
    376376                                     Line("/****************************************************************************") +
    377377                                     Line("**") +
    378                                      Line("** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).") +
    379                                      Line("** Contact: Nokia Corporation ([email protected])") +
     378                                     Line("** Copyright (C) 201 and/or its subsidiary(-ies).") +
     379                                     Line("** Contact: ") +
    380380                                     Line("**") +
    381381                                     Line("** This file is part of the Qt Toolkit.") +
Note: See TracChangeset for help on using the changeset viewer.