Ignore:
Timestamp:
Feb 10, 2010, 12:52:55 AM (16 years ago)
Author:
Dmitry A. Kuminov
Message:

vendor: Merged in qt-everywhere-opensource-src-4.6.1 from Nokia.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/vendor/nokia/qt/current/src/testlib/qsignaldumper.cpp

    r2 r556  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the QtTest module 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    8888    str += "Signal: ";
    8989    str += mo->className();
    90     str += "(";
     90    str += ;
    9191
    9292    QString objname = caller->objectName();
    … …  
    115115        } else if (typeId != QMetaType::Void) {
    116116            str.append(arg)
    117                 .append("(")
     117                .append()
    118118                .append(QVariant(typeId, argv[i + 1]).toString().toLocal8Bit())
    119                 .append(")");
     119                .append();
    120120        }
    121121        str.append(", ");
    … …  
    123123    if (str.endsWith(", "))
    124124        str.chop(2);
    125     str.append(")");
     125    str.append();
    126126    qPrintMessage(str);
    127127}
    … …  
    144144    str += "Slot: ";
    145145    str += mo->className();
    146     str += "(";
     146    str += ;
    147147
    148148    QString objname = caller->objectName();
Note: See TracChangeset for help on using the changeset viewer.