Changeset 561 for trunk/tools/activeqt


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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/activeqt/activeqt.pro

    r2 r561  
    33CONFIG  += ordered
    44
    5 contains(QT_EDITION, OpenSource|Console) {
    6     message("You are not licensed to use ActiveQt.")
    7 } else {
    8     SUBDIRS = dumpdoc \
    9               dumpcpp \
    10               testcon
    11 }
     5SUBDIRS = dumpdoc \
     6          dumpcpp \
     7          testcon
     8

  • trunk/tools/activeqt/dumpcpp/main.cpp

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    970970    BSTR nameString;
    971971    typelib->GetDocumentation(-1, &nameString, 0, 0, 0);
    972     libName = QString::fromUtf16((const ushort *)nameString);
     972    libName = QString::fromnameString);
    973973    SysFreeString(nameString);
    974974    if (!nameSpace.isEmpty())
    … …  
    10871087                        if (S_OK != typeinfo->GetDocumentation(-1, &bstr, 0, 0, 0))
    10881088                            break;
    1089                         className = QString::fromUtf16((const ushort *)bstr).toLatin1();
     1089                        className = QString::frombstr).toLatin1();
    10901090                        SysFreeString(bstr);
    10911091                        switch (typekind) {
    … …  
    12281228                if (S_OK != typeinfo->GetDocumentation(-1, &bstr, 0, 0, 0))
    12291229                    break;
    1230                 className = QString::fromUtf16((const ushort *)bstr).toLatin1();
     1230                className = QString::frombstr).toLatin1();
    12311231                SysFreeString(bstr);
    12321232

  • trunk/tools/activeqt/dumpdoc/main.cpp

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/ambientproperties.cpp

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/ambientproperties.h

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/ambientproperties.ui

    r2 r561  
    44**
    55** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    6 ** Contact: Qt Software Information ([email protected])
     6** All rights reserved.
     7** Contact: Nokia Corporation ([email protected])
    78**
    89** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2324** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2425**
    25 ** In addition, as a special exception, Nokia gives you certain
    26 ** additional rights. These rights are described in the Nokia Qt LGPL
    27 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    28 ** package.
     26** In addition, as a special exception, Nokia gives you certain additional
     27** rights.  These rights are described in the Nokia Qt LGPL Exception
     28** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2929**
    3030** GNU General Public License Usage
    … …  
    3636** met: http://www.gnu.org/copyleft/gpl.html.
    3737**
    38 ** If you are unsure which license is appropriate for your use, please
    39 ** contact the sales department at qt-sales@nokia.com.
     38** If you
     39** @nokia.com.
    4040** $QT_END_LICENSE$
    4141**

  • trunk/tools/activeqt/testcon/changeproperties.cpp

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/changeproperties.h

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/changeproperties.ui

    r2 r561  
    44**
    55** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    6 ** Contact: Qt Software Information ([email protected])
     6** All rights reserved.
     7** Contact: Nokia Corporation ([email protected])
    78**
    89** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2324** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2425**
    25 ** In addition, as a special exception, Nokia gives you certain
    26 ** additional rights. These rights are described in the Nokia Qt LGPL
    27 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    28 ** package.
     26** In addition, as a special exception, Nokia gives you certain additional
     27** rights.  These rights are described in the Nokia Qt LGPL Exception
     28** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2929**
    3030** GNU General Public License Usage
    … …  
    3636** met: http://www.gnu.org/copyleft/gpl.html.
    3737**
    38 ** If you are unsure which license is appropriate for your use, please
    39 ** contact the sales department at qt-sales@nokia.com.
     38** If you
     39** @nokia.com.
    4040** $QT_END_LICENSE$
    4141**

  • trunk/tools/activeqt/testcon/controlinfo.cpp

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/controlinfo.h

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/controlinfo.ui

    r2 r561  
    44**
    55** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    6 ** Contact: Qt Software Information ([email protected])
     6** All rights reserved.
     7** Contact: Nokia Corporation ([email protected])
    78**
    89** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2324** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2425**
    25 ** In addition, as a special exception, Nokia gives you certain
    26 ** additional rights. These rights are described in the Nokia Qt LGPL
    27 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    28 ** package.
     26** In addition, as a special exception, Nokia gives you certain additional
     27** rights.  These rights are described in the Nokia Qt LGPL Exception
     28** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2929**
    3030** GNU General Public License Usage
    … …  
    3636** met: http://www.gnu.org/copyleft/gpl.html.
    3737**
    38 ** If you are unsure which license is appropriate for your use, please
    39 ** contact the sales department at qt-sales@nokia.com.
     38** If you
     39** @nokia.com.
    4040** $QT_END_LICENSE$
    4141**

  • trunk/tools/activeqt/testcon/docuwindow.cpp

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/docuwindow.h

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/invokemethod.cpp

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/invokemethod.h

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/invokemethod.ui

    r2 r561  
    44**
    55** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    6 ** Contact: Qt Software Information ([email protected])
     6** All rights reserved.
     7** Contact: Nokia Corporation ([email protected])
    78**
    89** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2324** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2425**
    25 ** In addition, as a special exception, Nokia gives you certain
    26 ** additional rights. These rights are described in the Nokia Qt LGPL
    27 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    28 ** package.
     26** In addition, as a special exception, Nokia gives you certain additional
     27** rights.  These rights are described in the Nokia Qt LGPL Exception
     28** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2929**
    3030** GNU General Public License Usage
    … …  
    3636** met: http://www.gnu.org/copyleft/gpl.html.
    3737**
    38 ** If you are unsure which license is appropriate for your use, please
    39 ** contact the sales department at qt-sales@nokia.com.
     38** If you
     39** @nokia.com.
    4040** $QT_END_LICENSE$
    4141**

  • trunk/tools/activeqt/testcon/main.cpp

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/mainwindow.cpp

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    205205    if (!dlgProperties) {
    206206        dlgProperties = new ChangeProperties(this);
    207         connect(container, SIGNAL(propertyChanged(const QString&)), dlgProperties, SLOT(updateProperties()));
     207        connect(container, SIGNAL(propertyChanged()), dlgProperties, SLOT(updateProperties()));
    208208    }
    209209    dlgProperties->setControl(container);
    … …  
    337337    QAxScript *script = scripts->load(file, file);
    338338    if (script) {
    339         connect(script, SIGNAL(error(int, const QString&, int, const QString&)),
    340                 this,   SLOT(logMacro(int,  const QString&, int, const QString&)));
     339        connect(script, SIGNAL(error(int,)),
     340                this,   SLOT(logMacro(int,)));
    341341        actionScriptingRun->setEnabled(true);
    342342    }
    … …  
    375375        QAxWidget *ax = qobject_cast<QAxWidget*>(container);
    376376        if (ax) {
    377             container->disconnect(SIGNAL(signal(const QString&, int, void*)));
     377            container->disconnect(SIGNAL(signal(void*)));
    378378            if (actionLogSignals->isChecked())
    379                 connect(container, SIGNAL(signal(const QString&, int, void*)), this, SLOT(logSignal(const QString&, int, void*)));
    380 
    381             container->disconnect(SIGNAL(exception(int,const QString&,const QString&,const QString&)));
    382             connect(container, SIGNAL(exception(int,const QString&,const QString&,const QString&)),
    383                 this, SLOT(logException(int,const QString&,const QString&,const QString&)));
    384 
    385             container->disconnect(SIGNAL(propertyChanged(const QString&)));
     379                connect(container, SIGNAL(signal(void*)));
     380
     381            container->disconnect(SIGNAL(exception(int,)));
     382            connect(container, SIGNAL(exception(int,)),
     383                this, SLOT(logException(int,)));
     384
     385            container->disconnect(SIGNAL(propertyChanged()));
    386386            if (actionLogProperties->isChecked())
    387                 connect(container, SIGNAL(propertyChanged(const QString&)), this, SLOT(logPropertyChanged(const QString&)));
     387                connect(container, SIGNAL(propertyChanged()));
    388388            container->blockSignals(actionFreezeEvents->isChecked());
    389389        }

  • trunk/tools/activeqt/testcon/mainwindow.h

    r2 r561  
    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 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
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/tools/activeqt/testcon/mainwindow.ui

    r2 r561  
    44**
    55** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    6 ** Contact: Qt Software Information ([email protected])
     6** All rights reserved.
     7** Contact: Nokia Corporation ([email protected])
    78**
    89** This file is part of the tools applications of the Qt Toolkit.
    … …  
    2324** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2425**
    25 ** In addition, as a special exception, Nokia gives you certain
    26 ** additional rights. These rights are described in the Nokia Qt LGPL
    27 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    28 ** package.
     26** In addition, as a special exception, Nokia gives you certain additional
     27** rights.  These rights are described in the Nokia Qt LGPL Exception
     28** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2929**
    3030** GNU General Public License Usage
    … …  
    3636** met: http://www.gnu.org/copyleft/gpl.html.
    3737**
    38 ** If you are unsure which license is appropriate for your use, please
    39 ** contact the sales department at qt-sales@nokia.com.
     38** If you
     39** @nokia.com.
    4040** $QT_END_LICENSE$
    4141**

  • trunk/tools/activeqt/testcon/scripts/perlscript.pl

    r2 r561  
     1
     2
     3
     4
     5
     6
     7
     8
     9
     10
     11
     12
     13
     14
     15
     16
     17
     18
     19
     20
     21
     22
     23
     24
     25
     26
     27
     28
     29
     30
     31
     32
     33
     34
     35
     36
     37
     38
     39
     40
     41
    142sub QAxWidget2_Click {
    243        $QAxWidget2->{'lineWidth'} = $QAxWidget2->{'lineWidth'} + 1;

  • trunk/tools/activeqt/testcon/scripts/pythonscript.py

    r2 r561  
     1
     2
     3
     4
     5
     6
     7
     8
     9
     10
     11
     12
     13
     14
     15
     16
     17
     18
     19
     20
     21
     22
     23
     24
     25
     26
     27
     28
     29
     30
     31
     32
     33
     34
     35
     36
     37
     38
     39
     40
     41
     42
    143def QAxWidget2_Click():
    244    QAxWidget2.lineWidth = QAxWidget2.lineWidth + 1;
Note: See TracChangeset for help on using the changeset viewer.