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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/qt3support/other/q3accel.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    207207    if (qApp->d_func()->qt_compat_used)
    208208        return;
    209     QApplicationPrivate *data = static_cast<QApplicationPrivate*>(qApp->d_ptr);
     209    QApplicationPrivate *data = static_cast<QApplicationPrivate*>(qApp->d_ptr.data());
    210210    data->qt_tryAccelEvent = qt_tryAccelEvent;
    211211    data->qt_tryComposeUnicode = qt_tryComposeUnicode;

  • trunk/src/qt3support/other/q3accel.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3boxlayout.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3boxlayout.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3dragobject.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    9494    void setSubType(const QString & st) {
    9595        subtype = st;
    96         fmt = QString(QLatin1String("text/")).toLatin1() + subtype.toLatin1();
     96        fmt = "text/" + subtype.toLatin1();
    9797    }
    9898
    … …  
    192192    platform-specific implementation will use this where it can - so
    193193    provide a small masked pixmap, and do not assume that the user
    194     will actually see it. For example, cursors on Windows 95 are of
    195     limited size.
     194    will actually see it.
    196195
    197196    The \a hotspot is the point on (or off) the pixmap that should be
    … …  
    209208    d->pixmap = pm;
    210209    d->hot = hotspot;
    211 #if 0
    212     QDragManager *manager = QDragManager::self();
    213     if (manager && manager->object == d->data)
    214         manager->updatePixmap();
    215 #endif
    216210}
    217211
    … …  
    559553        if (i >= 0)
    560554            cs = cs.left(i);
    561         // win98 often has charset=utf16, and we need to get the correct codec for
    562         // it to be able to get Unicode text drops.
    563         if (cs == "utf16")
    564             cs = "ISO-10646-UCS-2";
    565555        // May return 0 if unknown charset
    566556        return QTextCodec::codecForName(cs);
    … …  
    13031293    }
    13041294#endif
    1305     return unicodeUriToUri(QString(QLatin1String("file://") + r));
     1295    return unicodeUriToUri(QLatin1String("file://") + r);
    13061296}
    13071297
    … …  
    13581348    if (0==qstrnicmp(uri,"file:/",6)) // It is a local file uri
    13591349        uri += 6;
    1360     else if (QString(QLatin1String(uri)).indexOf(QLatin1String(":/")) != -1) // It is a different scheme uri
     1350    else if (QString::fromLatin1(uri).indexOf(QLatin1String(":/")) != -1) // It is a different scheme uri
    13611351        return file;
    13621352

  • trunk/src/qt3support/other/q3dragobject.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3dropsite.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3dropsite.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3gridlayout.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3membuf.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3membuf_p.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3mimefactory.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3mimefactory.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3polygonscanner.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3polygonscanner.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3process.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    484484
    485485      if ( !buf->scanNewline( &a ) )
    486         return QString( QLatin1String(buf->readAll()) );
     486        return QLatin1String(buf->readAll());
    487487    }
    488488

  • trunk/src/qt3support/other/q3process.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/q3process_unix.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    6161#include "private/q3membuf_p.h"
    6262#include "private/qobject_p.h"
     63#include "private/qcore_unix_p.h"
    6364
    6465#include <stdlib.h>
    … …  
    161162        }
    162163        if( socketStdin )
    163             ::close( socketStdin );
     164            qt_safe_close( socketStdin );
    164165        if( socketStdout )
    165             ::close( socketStdout );
     166            qt_safe_close( socketStdout );
    166167        if( socketStderr )
    167             ::close( socketStderr );
     168            qt_safe_close( socketStderr );
    168169    }
    169170
    … …  
    214215
    215216#ifdef Q_OS_QNX6
    216 #define BAILOUT close(tmpSocket);close(socketFD[1]);return -1;
     217#define BAILOUT qt_safe_close(tmpSocket);qt_safe_close(socketFD[1]);return -1;
    217218int qnx6SocketPairReplacement (int socketFD[2]) {
    218219    int tmpSocket;
    … …  
    249250
    250251    // Accept connection
    251     socketFD[0] = accept(tmpSocket, (struct sockaddr *)NULL, (size_t *)NULL);
     252    socketFD[0] = accept(tmpSocket, (struct sockaddr *)NULL, (QT_SOCKLEN_T *)NULL);
    252253    if(socketFD[0] == -1) { BAILOUT };
    253254
    254255    // We're done
    255     close(tmpSocket);
     256    qt_safe_close(tmpSocket);
    256257
    257258    // Restore original flags , ie return to blocking
    … …  
    320321
    321322    if ( sigchldFd[0] != 0 )
    322         ::close( sigchldFd[0] );
     323        qt_safe_close( sigchldFd[0] );
    323324    if ( sigchldFd[1] != 0 )
    324         ::close( sigchldFd[1] );
     325        qt_safe_close( sigchldFd[1] );
    325326
    326327    // restore SIGCHLD handler
    … …  
    385386
    386387    char tmp;
    387     ::read( fd, &tmp, sizeof(tmp) );
     388    qt_safe_read( fd, &tmp, sizeof(tmp) );
    388389#if defined(QT_Q3PROCESS_DEBUG)
    389390    qDebug( "Q3ProcessManager::sigchldHnd()" );
    … …  
    435436                // socket notifiers
    436437                if ( proc->socketStdout ) {
    437                     ::close( proc->socketStdout );
     438                    qt_safe_close( proc->socketStdout );
    438439                    proc->socketStdout = 0;
    439440                    if (process->d->notifierStdout)
    … …  
    441442                }
    442443                if ( proc->socketStderr ) {
    443                     ::close( proc->socketStderr );
     444                    qt_safe_close( proc->socketStderr );
    444445                    proc->socketStderr = 0;
    445446                    if (process->d->notifierStderr)
    … …  
    510511    if ( proc != 0 ) {
    511512        if ( proc->socketStdin != 0 ) {
    512             ::close( proc->socketStdin );
     513            qt_safe_close( proc->socketStdin );
    513514            proc->socketStdin = 0;
    514515        }
    … …  
    533534    if ( procManager != 0 ) {
    534535        if ( procManager->sigchldFd[0] != 0 )
    535             ::close( procManager->sigchldFd[0] );
     536            qt_safe_close( procManager->sigchldFd[0] );
    536537        if ( procManager->sigchldFd[1] != 0 )
    537             ::close( procManager->sigchldFd[1] );
     538            qt_safe_close( procManager->sigchldFd[1] );
    538539
    539540        // close also the sockets from other Q3Process instances
    540541        for ( QProc *p=procManager->procList->first(); p!=0; p=procManager->procList->next() ) {
    541             ::close( p->socketStdin );
    542             ::close( p->socketStdout );
    543             ::close( p->socketStderr );
     542            qt_safe_close( p->socketStdin );
     543            qt_safe_close( p->socketStdout );
     544            qt_safe_close( p->socketStderr );
    544545        }
    545546    }
    … …  
    570571
    571572    char a = 1;
    572     ::write( Q3ProcessPrivate::procManager->sigchldFd[0], &a, sizeof(a) );
     573    qt_safe_write( Q3ProcessPrivate::procManager->sigchldFd[0], &a, sizeof(a) );
    573574}
    574575
    … …  
    683684#endif
    684685        if ( comms & Stdin ) {
    685             ::close( sStdin[0] );
    686             ::close( sStdin[1] );
     686            qt_safe_close( sStdin[0] );
     687            qt_safe_close( sStdin[1] );
    687688        }
    688689        return false;
    … …  
    694695#endif
    695696        if ( comms & Stdin ) {
    696             ::close( sStdin[0] );
    697             ::close( sStdin[1] );
     697            qt_safe_close( sStdin[0] );
     698            qt_safe_close( sStdin[1] );
    698699        }
    699700        if ( comms & Stderr ) {
    700             ::close( sStderr[0] );
    701             ::close( sStderr[1] );
     701            qt_safe_close( sStderr[0] );
     702            qt_safe_close( sStderr[1] );
    702703        }
    703704        return false;
    … …  
    759760        d->closeOpenSocketsForChild();
    760761        if ( comms & Stdin ) {
    761             ::close( sStdin[1] );
     762            qt_safe_close( sStdin[1] );
    762763            ::dup2( sStdin[0], STDIN_FILENO );
    763764        }
    764765        if ( comms & Stdout ) {
    765             ::close( sStdout[0] );
     766            qt_safe_close( sStdout[0] );
    766767            ::dup2( sStdout[1], STDOUT_FILENO );
    767768        }
    768769        if ( comms & Stderr ) {
    769             ::close( sStderr[0] );
     770            qt_safe_close( sStderr[0] );
    770771            ::dup2( sStderr[1], STDERR_FILENO );
    771772        }
    … …  
    777778#endif
    778779        if ( fd[0] )
    779             ::close( fd[0] );
     780            qt_safe_close( fd[0] );
    780781        if ( fd[1] )
    781782            ::fcntl( fd[1], F_SETFD, FD_CLOEXEC ); // close on exec shows success
    … …  
    829830                        QFileInfo fileInfo( dir, command );
    830831#else
    831                         QFileInfo fileInfo( dir + "/" + command );
     832                        QFileInfo fileInfo( dir + QLatin1Char('/') + command );
    832833#endif
    833834                        if ( fileInfo.isExecutable() ) {
    … …  
    851852        if ( fd[1] ) {
    852853            char buf = 0;
    853             ::write( fd[1], &buf, 1 );
    854             ::close( fd[1] );
     854            qt_safe_write( fd[1], &buf, 1 );
     855            qt_safe_close( fd[1] );
    855856        }
    856857        ::_exit( -1 );
    … …  
    862863    // test if exec was successful
    863864    if ( fd[1] )
    864         ::close( fd[1] );
     865        qt_safe_close( fd[1] );
    865866    if ( fd[0] ) {
    866867        char buf;
    … …  
    883884            break;
    884885        }
    885         ::close( fd[0] );
     886        qt_safe_close( fd[0] );
    886887    }
    887888
    … …  
    889890
    890891    if ( comms & Stdin ) {
    891         ::close( sStdin[0] );
     892        qt_safe_close( sStdin[0] );
    892893        d->proc->socketStdin = sStdin[1];
    893894
    … …  
    905906    }
    906907    if ( comms & Stdout ) {
    907         ::close( sStdout[1] );
     908        qt_safe_close( sStdout[1] );
    908909        d->proc->socketStdout = sStdout[0];
    909910        d->notifierStdout = new QSocketNotifier( sStdout[0], QSocketNotifier::Read );
    … …  
    914915    }
    915916    if ( comms & Stderr ) {
    916         ::close( sStderr[1] );
     917        qt_safe_close( sStderr[1] );
    917918        d->proc->socketStderr = sStderr[0];
    918919        d->notifierStderr = new QSocketNotifier( sStderr[0], QSocketNotifier::Read );
    … …  
    935936        d->procManager->cleanup();
    936937    if ( comms & Stdin ) {
    937         ::close( sStdin[1] );
    938         ::close( sStdin[0] );
     938        qt_safe_close( sStdin[1] );
     939        qt_safe_close( sStdin[0] );
    939940    }
    940941    if ( comms & Stdout ) {
    941         ::close( sStdout[0] );
    942         ::close( sStdout[1] );
     942        qt_safe_close( sStdout[0] );
     943        qt_safe_close( sStdout[1] );
    943944    }
    944945    if ( comms & Stderr ) {
    945         ::close( sStderr[0] );
    946         ::close( sStderr[1] );
    947     }
    948     ::close( fd[0] );
    949     ::close( fd[1] );
     946        qt_safe_close( sStderr[0] );
     947        qt_safe_close( sStderr[1] );
     948    }
     949    qt_safe_close( fd[0] );
     950    qt_safe_close( fd[1] );
    950951    delete[] arglistQ;
    951952    delete[] arglist;
    … …  
    10501051        qDeleteInEventHandler(d->notifierStdin);
    10511052        d->notifierStdin = 0;
    1052         if ( ::close( d->proc->socketStdin ) != 0 ) {
     1053        if ( qt_safe_close( d->proc->socketStdin ) != 0 ) {
    10531054            qWarning( "Could not close stdin of child process" );
    10541055        }
    … …  
    11161117            qDeleteInEventHandler(d->notifierStdout);
    11171118            d->notifierStdout = 0;
    1118             ::close( d->proc->socketStdout );
     1119            qt_safe_close( d->proc->socketStdout );
    11191120            d->proc->socketStdout = 0;
    11201121            return;
    … …  
    11261127            qDeleteInEventHandler(d->notifierStderr);
    11271128            d->notifierStderr = 0;
    1128             ::close( d->proc->socketStderr );
     1129            qt_safe_close( d->proc->socketStderr );
    11291130            d->proc->socketStderr = 0;
    11301131            return;

  • trunk/src/qt3support/other/q3process_win.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    286286        QString tmp = *it;
    287287        // escape a single " because the arguments will be parsed
    288         tmp.replace( QLatin1String("\""), QLatin1String("\\\"") );
     288        tmp.replace( QLatin1Char('\"'), QLatin1String("\\\"") );
    289289        if ( tmp.isEmpty() || tmp.contains( QLatin1Char(' ') ) || tmp.contains( QLatin1Char('\t') ) ) {
    290290            // The argument must not end with a \ since this would be interpreted
    … …  
    295295            while ( i>0 && tmp.at( i-1 ) == QLatin1Char('\\') ) {
    296296                --i;
    297                 endQuote += QLatin1String("\\");
     297                endQuote += QLatin1Char('\\');
    298298            }
    299             args += QString( QLatin1String(" \"") ) + tmp.left( i ) + endQuote;
     299        args += QLatin1String(" \"") + tmp.left( i ) + endQuote;
    300300        } else {
    301301            args += QLatin1Char(' ') + tmp;
    … …  
    309309    bool success;
    310310    d->newPid();
    311 #ifdef UNICODE
    312     if (!(QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)) {
    313         STARTUPINFOW startupInfo = {
    314             sizeof( STARTUPINFO ), 0, 0, 0,
    315             (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
    316             0, 0, 0,
    317             STARTF_USESTDHANDLES,
    318             0, 0, 0,
    319             d->pipeStdin[0], d->pipeStdout[1], d->pipeStderr[1]
    320         };
    321         TCHAR *applicationName;
    322         if ( appName.isNull() )
    323             applicationName = 0;
    324         else
    325             applicationName = _wcsdup( (TCHAR*)appName.ucs2() );
    326         TCHAR *commandLine = _wcsdup( (TCHAR*)args.ucs2() );
    327         QByteArray envlist;
    328         if ( env != 0 ) {
    329             int pos = 0;
    330             // add PATH if necessary (for DLL loading)
    331             QByteArray path = qgetenv( "PATH" );
    332             if ( env->grep( QRegExp(QLatin1String("^PATH="),FALSE) ).empty() && !path.isNull() ) {
    333                 QString tmp = QString( QLatin1String("PATH=%1") ).arg(QString::fromLatin1(path.constData()));
    334                 uint tmpSize = sizeof(TCHAR) * (tmp.length()+1);
    335                 envlist.resize( envlist.size() + tmpSize );
    336                 memcpy( envlist.data()+pos, tmp.ucs2(), tmpSize );
    337                 pos += tmpSize;
    338             }
    339             // add the user environment
    340             for ( QStringList::Iterator it = env->begin(); it != env->end(); it++ ) {
    341                 QString tmp = *it;
    342                 uint tmpSize = sizeof(TCHAR) * (tmp.length()+1);
    343                 envlist.resize( envlist.size() + tmpSize );
    344                 memcpy( envlist.data()+pos, tmp.ucs2(), tmpSize );
    345                 pos += tmpSize;
    346             }
    347             // add the 2 terminating 0 (actually 4, just to be on the safe side)
    348             envlist.resize( envlist.size()+4 );
    349             envlist[pos++] = 0;
    350             envlist[pos++] = 0;
    351             envlist[pos++] = 0;
    352             envlist[pos++] = 0;
    353         }
    354         success = CreateProcessW( applicationName, commandLine,
    355                 0, 0, TRUE, ( comms==0 ? CREATE_NEW_CONSOLE : CREATE_NO_WINDOW )
     311
     312    STARTUPINFOW startupInfo = {
     313        sizeof( STARTUPINFO ), 0, 0, 0,
     314        (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
     315        0, 0, 0,
     316        STARTF_USESTDHANDLES,
     317        0, 0, 0,
     318        d->pipeStdin[0], d->pipeStdout[1], d->pipeStderr[1]
     319    };
     320    wchar_t *applicationName;
     321    if ( appName.isNull() )
     322        applicationName = 0;
     323    else
     324        applicationName = _wcsdup( (wchar_t*)appName.utf16() );
     325    wchar_t *commandLine = _wcsdup( (wchar_t*)args.utf16() );
     326    QByteArray envlist;
     327    if ( env != 0 ) {
     328        int pos = 0;
     329        // add PATH if necessary (for DLL loading)
     330        QByteArray path = qgetenv( "PATH" );
     331        if ( env->grep( QRegExp(QLatin1String("^PATH="),FALSE) ).empty() && !path.isNull() ) {
     332            QString tmp = QString::fromLatin1("PATH=%1").arg(QLatin1String(path.constData()));
     333            uint tmpSize = sizeof(wchar_t) * (tmp.length() + 1);
     334            envlist.resize( envlist.size() + tmpSize );
     335            memcpy( envlist.data() + pos, tmp.utf16(), tmpSize );
     336            pos += tmpSize;
     337        }
     338        // add the user environment
     339        for ( QStringList::Iterator it = env->begin(); it != env->end(); it++ ) {
     340            QString tmp = *it;
     341            uint tmpSize = sizeof(wchar_t) * (tmp.length() + 1);
     342            envlist.resize( envlist.size() + tmpSize );
     343            memcpy( envlist.data() + pos, tmp.utf16(), tmpSize );
     344            pos += tmpSize;
     345        }
     346        // add the 2 terminating 0 (actually 4, just to be on the safe side)
     347        envlist.resize( envlist.size()+4 );
     348        envlist[pos++] = 0;
     349        envlist[pos++] = 0;
     350        envlist[pos++] = 0;
     351        envlist[pos++] = 0;
     352    }
     353    success = CreateProcess( applicationName, commandLine,
     354                            0, 0, TRUE, ( comms == 0 ? CREATE_NEW_CONSOLE : CREATE_NO_WINDOW )
    356355#ifndef Q_OS_WINCE
    357                 | CREATE_UNICODE_ENVIRONMENT
     356                            | CREATE_UNICODE_ENVIRONMENT
    358357#endif
    359                 , env==0 ? 0 : envlist.data(),
    360                 (TCHAR*)QDir::toNativeSeparators(workingDir.absPath()).ucs2(),
    361                 &startupInfo, d->pid );
    362         free( applicationName );
    363         free( commandLine );
    364     } else
    365 #endif // UNICODE
    366     {
    367 #ifndef Q_OS_WINCE
    368         STARTUPINFOA startupInfo = { sizeof( STARTUPINFOA ), 0, 0, 0,
    369             (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
    370             0, 0, 0,
    371             STARTF_USESTDHANDLES,
    372             0, 0, 0,
    373             d->pipeStdin[0], d->pipeStdout[1], d->pipeStderr[1]
    374         };
    375         QByteArray envlist;
    376         if ( env != 0 ) {
    377             int pos = 0;
    378             // add PATH if necessary (for DLL loading)
    379             QByteArray path = qgetenv( "PATH" );
    380             if ( env->grep( QRegExp(QLatin1String("^PATH="),FALSE) ).empty() && !path.isNull() ) {
    381                 Q3CString tmp = QString( QLatin1String("PATH=%1") ).arg(QString::fromLatin1(path.constData())).local8Bit();
    382                 uint tmpSize = tmp.length() + 1;
    383                 envlist.resize( envlist.size() + tmpSize );
    384                 memcpy( envlist.data()+pos, tmp.data(), tmpSize );
    385                 pos += tmpSize;
    386             }
    387             // add the user environment
    388             for ( QStringList::Iterator it = env->begin(); it != env->end(); it++ ) {
    389                 Q3CString tmp = (*it).local8Bit();
    390                 uint tmpSize = tmp.length() + 1;
    391                 envlist.resize( envlist.size() + tmpSize );
    392                 memcpy( envlist.data()+pos, tmp.data(), tmpSize );
    393                 pos += tmpSize;
    394             }
    395             // add the terminating 0 (actually 2, just to be on the safe side)
    396             envlist.resize( envlist.size()+2 );
    397             envlist[pos++] = 0;
    398             envlist[pos++] = 0;
    399         }
    400         char *applicationName;
    401         if ( appName.isNull() )
    402             applicationName = 0;
    403         else
    404             applicationName = const_cast<char *>(appName.toLocal8Bit().data());
    405         success = CreateProcessA( applicationName,
    406                 const_cast<char *>(args.toLocal8Bit().data()),
    407                 0, 0, TRUE, comms==0 ? CREATE_NEW_CONSOLE : DETACHED_PROCESS,
    408                 env==0 ? 0 : envlist.data(),
    409                 (const char*)QDir::toNativeSeparators(workingDir.absPath()).local8Bit(),
    410                 &startupInfo, d->pid );
    411 #endif // Q_OS_WINCE
    412     }
     358                            , env == 0 ? 0 : envlist.data(),
     359                            (wchar_t*)QDir::toNativeSeparators(workingDir.absPath()).utf16(),
     360                            &startupInfo, d->pid );
     361
     362    free( applicationName );
     363    free( commandLine );
     364
    413365    if  ( !success ) {
    414366        d->deletePid();

  • trunk/src/qt3support/other/qiconset.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/qt3support/other/qt_compat_pch.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the Qt3Support 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
Note: See TracChangeset for help on using the changeset viewer.