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:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/qtconcurrent/codegenerator/example/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconcurrent/codegenerator/src/codegenerator.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconcurrent/codegenerator/src/codegenerator.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconcurrent/generaterun/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    326326                       Line("/****************************************************************************") +
    327327                       Line("**") +
    328                        Line("** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).") +
     328                       Line("** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).") +
    329329                       Line("** Contact: Nokia Corporation (qt-info@nokia.com)") +
    330330                       Line("**") +
    … …  
    376376                                     Line("/****************************************************************************") +
    377377                                     Line("**") +
    378                                      Line("** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).") +
     378                                     Line("** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).") +
    379379                                     Line("** Contact: Nokia Corporation (qt-info@nokia.com)") +
    380380                                     Line("**") +
Note: See TracChangeset for help on using the changeset viewer.