Changeset 561 for trunk/src/tools/rcc


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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/tools/rcc/main.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 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/src/tools/rcc/rcc.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 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 have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    453453                                return false;
    454454                        } else if (file.isFile()) {
    455                             const bool arc = addFile(alias, RCCFileInfo(alias.section(slash, -1), file, language, country,
    456                                                                         RCCFileInfo::NoFlags, compressLevel, compressThreshold));
     455                            const bool arc =
     456                                addFile(alias,
     457                                        RCCFileInfo(alias.section(slash, -1),
     458                                                    file,
     459                                                    language,
     460                                                    country,
     461                                                    RCCFileInfo::NoFlags,
     462                                                    compressLevel,
     463                                                    compressThreshold)
     464                                        );
    457465                            if (!arc)
    458466                                m_failedResources.push_back(absFileName);
    … …  
    474482                                QFileInfo child(it.fileInfo());
    475483                                if (child.fileName() != QLatin1String(".") && child.fileName() != QLatin1String("..")) {
    476                                     const bool arc = addFile(alias + child.fileName(),
    477                                                              RCCFileInfo(child.fileName(), child, language, country,
    478                                                              RCCFileInfo::NoFlags, compressLevel, compressThreshold));
     484                                    const bool arc =
     485                                        addFile(alias + child.fileName(),
     486                                                RCCFileInfo(child.fileName(),
     487                                                            child,
     488                                                            language,
     489                                                            country,
     490                                                            RCCFileInfo::NoFlags,
     491                                                            compressLevel,
     492                                                            compressThreshold)
     493                                                );
    479494                                    if (!arc)
    480495                                        m_failedResources.push_back(child.fileName());
    … …  
    895910            writeString("QT_BEGIN_NAMESPACE\n\n");
    896911        if (m_root) {
    897             writeString("extern bool qRegisterResourceData\n    "
     912            writeString("extern Q_CORE_EXPORT bool qRegisterResourceData\n    "
    898913                "(int, const unsigned char *, "
    899914                "const unsigned char *, const unsigned char *);\n\n");
    900             writeString("extern bool qUnregisterResourceData\n    "
     915            writeString("extern Q_CORE_EXPORT bool qUnregisterResourceData\n    "
    901916                "(int, const unsigned char *, "
    902917                "const unsigned char *, const unsigned char *);\n\n");

  • trunk/src/tools/rcc/rcc.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 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 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.