Changeset 561 for trunk/src/tools/moc

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/tools/moc/generator.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**
    … …  
    4646#include <stdio.h>
    4747
     48
     49
    4850QT_BEGIN_NAMESPACE
    49 
    50 // if the flags change, you MUST to change it in qmetaobject.cpp too
    51 enum PropertyFlags  {
    52     Invalid = 0x00000000,
    53     Readable = 0x00000001,
    54     Writable = 0x00000002,
    55     Resettable = 0x00000004,
    56     EnumOrFlag = 0x00000008,
    57     StdCppSet = 0x00000100,
    58 //     Override = 0x00000200,
    59     Designable = 0x00001000,
    60     ResolveDesignable = 0x00002000,
    61     Scriptable = 0x00004000,
    62     ResolveScriptable = 0x00008000,
    63     Stored = 0x00010000,
    64     ResolveStored = 0x00020000,
    65     Editable = 0x00040000,
    66     ResolveEditable = 0x00080000,
    67     User = 0x00100000,
    68     ResolveUser = 0x00200000,
    69     Notify = 0x00400000
    70 };
    71 enum MethodFlags {
    72     AccessPrivate = 0x00,
    73     AccessProtected = 0x01,
    74     AccessPublic = 0x02,
    75     MethodMethod = 0x00,
    76     MethodSignal = 0x04,
    77     MethodSlot = 0x08,
    78     MethodConstructor = 0x0c,
    79     MethodCompatibility = 0x10,
    80     MethodCloned = 0x20,
    81     MethodScriptable = 0x40
    82 };
    8351
    8452uint qvariant_nameToType(const char* name)
    … …  
    10876{
    10977    return qvariant_nameToType(type) != 0;
     78
     79
     80
     81
     82
     83
     84
     85
    11086}
    11187
    … …  
    195171    qualifiedClassNameIdentifier.replace(':', '_');
    196172
    197     int index = 12;
     173    int index = 1;
    198174    fprintf(out, "static const uint qt_meta_data_%s[] = {\n", qualifiedClassNameIdentifier.constData());
    199175    fprintf(out, "\n // content:\n");
    200     fprintf(out, "    %4d,       // revision\n", 2);
     176    fprintf(out, "    %4d,       // revision\n", );
    201177    fprintf(out, "    %4d,       // classname\n", strreg(cdef->qualified));
    202178    fprintf(out, "    %4d, %4d, // classinfo\n", cdef->classInfoList.count(), cdef->classInfoList.count() ? index : 0);
    … …  
    217193    fprintf(out, "    %4d, %4d, // constructors\n", isConstructible ? cdef->constructorList.count() : 0,
    218194            isConstructible ? index : 0);
     195
     196
     197
     198
    219199
    220200//
    … …  
    313293    for (int i = 0; i < cdef->propertyList.count(); ++i) {
    314294        const PropertyDef &p = cdef->propertyList.at(i);
    315         if (!isVariantType(p.type) && !metaTypes.contains(p.type)) {
     295        if (!isVariantType(p.type) && !metaTypes.contains(p.type) && !p.type.contains('*') &&
     296                !p.type.contains('<') && !p.type.contains('>')) {
    316297            int s = p.type.lastIndexOf("::");
    317298            if (s > 0) {
    … …  
    323304    }
    324305    if (!extraList.isEmpty()) {
     306
     307
     308
     309
     310
     311
    325312        fprintf(out, "static const QMetaObject *qt_meta_extradata_%s[] = {\n    ", qualifiedClassNameIdentifier.constData());
    326313        for (int i = 0; i < extraList.count(); ++i) {
    327             if (i)
    328                 fprintf(out, ",\n    ");
    329             fprintf(out, "    &%s::staticMetaObject", extraList.at(i).constData());
    330         }
    331         fprintf(out, ",0\n};\n\n");
     314            fprintf(out, "    &%s::staticMetaObject,\n", extraList.at(i).constData());
     315        }
     316        fprintf(out, "#endif //Q_NO_DATA_RELOCATION\n");
     317        fprintf(out, "    0\n};\n\n");
    332318    }
    333319
    … …  
    349335// Finally create and initialize the static meta object
    350336//
    351 
    352337    if (isQt)
    353338        fprintf(out, "const QMetaObject QObject::staticQtMetaObject = {\n");
    … …  
    369354    fprintf(out, "};\n");
    370355
    371     if (isQt || !cdef->hasQObject)
     356    ift)
    372357        return;
    373358
    374     fprintf(out, "\nconst QMetaObject *%s::metaObject() const\n{\n    return &staticMetaObject;\n}\n",
     359//
     360// Generate static meta object accessor (needed for symbian, because DLLs do not support data imports.
     361//
     362    fprintf(out, "\n#ifdef Q_NO_DATA_RELOCATION\n");
     363    fprintf(out, "const QMetaObject &%s::getStaticMetaObject() { return staticMetaObject; }\n", cdef->qualified.constData());
     364    fprintf(out, "#endif //Q_NO_DATA_RELOCATION\n");
     365
     366    if (!cdef->hasQObject)
     367        return;
     368
     369    fprintf(out, "\nconst QMetaObject *%s::metaObject() const\n{\n    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;\n}\n",
    375370            cdef->qualified.constData());
     371
    376372//
    377373// Generate smart cast function
    … …  
    546542        if (!isVariantType(p.type)) {
    547543            flags |= EnumOrFlag;
    548         } else {
     544        } else {
    549545            flags |= qvariant_nameToType(p.type) << 24;
    550546        }
    … …  
    590586            flags |= Notify;
    591587
    592         fprintf(out, "    %4d, %4d, 0x%.8x,\n",
    593                  strreg(p.name),
    594                  strreg(p.type),
    595                  flags);
     588        if (p.constant)
     589            flags |= Constant;
     590        if (p.final)
     591            flags |= Final;
     592
     593        fprintf(out, "    %4d, %4d, ",
     594                strreg(p.name),
     595                strreg(p.type));
     596        if (!(flags >> 24) && isQRealType(p.type))
     597            fprintf(out, "(QMetaType::QReal << 24) | ");
     598        fprintf(out, "0x%.8x,\n", flags);
    596599    }
    597600
    … …  
    723726            needUser |= p.user.endsWith(')');
    724727        }
    725         bool needAnything = needGet
    726                             | needSet
    727                             | needReset
    728                             | needDesignable
    729                             | needScriptable
    730                             | needStored
    731                             | needEditable
    732                             | needUser;
    733         if (!needAnything)
    734             goto skip_properties;
    735728        fprintf(out, "\n#ifndef QT_NO_PROPERTIES\n     ");
    736729
    … …  
    902895        fprintf(out, "\n#endif // QT_NO_PROPERTIES");
    903896    }
    904  skip_properties:
    905897    if (methodList.size() || cdef->signalList.size() || cdef->propertyList.size())
    906898        fprintf(out, "\n    ");
    … …  
    919911    for (int ctorindex = 0; ctorindex < cdef->constructorList.count(); ++ctorindex) {
    920912        fprintf(out, "        case %d: { %s *_r = new %s(", ctorindex,
    921                 cdef->classname.constData(), cdef->classname.constData());
     913                cdef->.constData());
    922914        const FunctionDef &f = cdef->constructorList.at(ctorindex);
    923915        int offset = 1;
    … …  
    937929
    938930    if (!isQObject)
    939         fprintf(out, "    _id = %s::staticMetaObject.superClass()->static_metacall(_c, _id, _a);\n", cdef->classname.constData());
     931        fprintf(out, "    _id = %s::staticMetaObject.superClass()->static_metacall(_c, _id, _a);\n", cdef->.constData());
    940932
    941933    fprintf(out, "    if (_id < 0)\n        return _id;\n");
    … …  
    996988            fprintf(out, ", const_cast<void*>(reinterpret_cast<const void*>(&_t%d))", i);
    997989    fprintf(out, " };\n");
    998     int n = 0;
    999     for (i = 0; i < def->arguments.count(); ++i)
    1000         if (def->arguments.at(i).isDefault)
    1001             ++n;
    1002     if (n)
    1003         fprintf(out, "    QMetaObject::activate(%s, &staticMetaObject, %d, %d, _a);\n", thisPtr.constData(), index, index + n);
    1004     else
    1005         fprintf(out, "    QMetaObject::activate(%s, &staticMetaObject, %d, _a);\n", thisPtr.constData(), index);
     990    fprintf(out, "    QMetaObject::activate(%s, &staticMetaObject, %d, _a);\n", thisPtr.constData(), index);
    1006991    if (def->normalizedType.size())
    1007992        fprintf(out, "    return _t0;\n");
    … …  
    11621147            const ArgumentDef &a = f.arguments.at(j);
    11631148            if (j) {
    1164                 sig += ",";
    1165                 arguments += ",";
     1149                sig += ;
     1150                arguments += ;
    11661151            }
    11671152            sig += a.normalizedType;

  • trunk/src/tools/moc/generator.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/src/tools/moc/keywords.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/src/tools/moc/main.cpp

    r93 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**
    … …  
    219219    }
    220220
    221     // report Qt usage for commercial customers with a "metered license" (currently experimental)
    222 #if QT_EDITION != QT_EDITION_OPENSOURCE
    223 #ifdef QT_CONFIGURE_BINARIES_PATH
    224     const char *binariesPath = QT_CONFIGURE_BINARIES_PATH;
    225     QString reporterPath = QString::fromLocal8Bit(binariesPath) + QDir::separator()
    226                            + QLatin1String("qtusagereporter");
    227 #if defined(Q_OS_WIN)
    228     reporterPath += QLatin1String(".exe");
    229 #endif
    230     if (QFile::exists(reporterPath))
    231         system(qPrintable(reporterPath + QLatin1String(" moc")));
    232 #endif
    233 #endif
    234 
    235221    int argc = argv.count();
    236222

  • trunk/src/tools/moc/moc.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**
    … …  
    338338{
    339339    def->isVirtual = false;
    340     while (test(INLINE) || test(STATIC) || test(VIRTUAL)
    341            || testFunctionAttribute(def)) {
    342         if (lookup() == VIRTUAL)
    343             def->isVirtual = true;
    344     }
     340    //skip modifiers and attributes
     341    while (test(INLINE) || test(STATIC) ||
     342        (test(VIRTUAL) && (def->isVirtual = true)) //mark as virtual
     343        || testFunctionAttribute(def)) {}
    345344    bool templateFunction = (lookup() == TEMPLATE);
    346345    def->type = parseType();
    … …  
    430429{
    431430    def->isVirtual = false;
    432     while (test(EXPLICIT) || test(INLINE) || test(STATIC) || test(VIRTUAL)
    433            || testFunctionAttribute(def)) {
    434         if (lookup() == VIRTUAL)
    435             def->isVirtual = true;
    436     }
     431    //skip modifiers and attributes
     432    while (test(EXPLICIT) || test(INLINE) || test(STATIC) ||
     433        (test(VIRTUAL) && (def->isVirtual = true)) //mark as virtual
     434        || testFunctionAttribute(def)) {}
    437435    bool tilde = test(TILDE);
    438436    def->type = parseType();
    … …  
    753751
    754752    if (!noInclude) {
    755         if (includePath.size() && includePath.right(1) != "/")
    756             includePath += "/";
     753        if (includePath.size() && )
     754            includePath += ;
    757755        for (int i = 0; i < includeFiles.size(); ++i) {
    758756            QByteArray inc = includeFiles.at(i);
    … …  
    760758                if (includePath.size() && includePath != "./")
    761759                    inc.prepend(includePath);
    762                 inc = "\"" + inc + "\"";
     760                inc = ;
    763761            }
    764762            fprintf(out, "#include %s\n", inc.constData());
    … …  
    767765    if (classList.size() && classList.first().classname == "Qt")
    768766        fprintf(out, "#include <QtCore/qobject.h>\n");
     767
     768
     769
    769770
    770771    fprintf(out, "#if !defined(Q_MOC_OUTPUT_REVISION)\n"
    … …  
    860861        parseFunction(&funcDef);
    861862        if (funcDef.isVirtual)
    862             error("Signals cannot be declared virtual");
     863            ("Signals cannot be declared virtual");
    863864        if (funcDef.inlineCode)
    864865            error("Not a signal declaration");
    … …  
    899900    else if (type == "ULongLong")
    900901        type = "qulonglong";
     902
     903
     904
    901905    propDef.type = type;
    902906
    … …  
    905909    while (test(IDENTIFIER)) {
    906910        QByteArray l = lexem();
     911
     912
     913
     914
     915
     916
     917
     918
     919
    907920        QByteArray v, v2;
    908921        if (test(LPAREN)) {
    … …  
    960973        warning(msg.constData());
    961974    }
    962     if(!propDef.notify.isEmpty())
     975    if (propDef.constant && !propDef.write.isNull()) {
     976        QByteArray msg;
     977        msg += "Property declaration ";
     978        msg += propDef.name;
     979        msg += " is both WRITEable and CONSTANT. CONSTANT will be ignored.";
     980        propDef.constant = false;
     981        warning(msg.constData());
     982    }
     983    if (propDef.constant && !propDef.notify.isNull()) {
     984        QByteArray msg;
     985        msg += "Property declaration ";
     986        msg += propDef.name;
     987        msg += " is both NOTIFYable and CONSTANT. CONSTANT will be ignored.";
     988        propDef.constant = false;
     989        warning(msg.constData());
     990    }
     991
     992    if(!propDef.notify.isEmpty())
    963993        def->notifyableProperties++;
    964994

  • trunk/src/tools/moc/moc.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**
    … …  
    5959
    6060    inline Type() : isVolatile(false), isScoped(false), firstToken(NOTOKEN), referenceType(NoReference) {}
    61     inline explicit Type(const QByteArray &_name) : name(_name), isVolatile(false), firstToken(NOTOKEN), referenceType(NoReference) {}
     61    inline explicit Type(const QByteArray &_name) : name(_name), isVolatile(false), firstToken(NOTOKEN), referenceType(NoReference) {}
    6262    QByteArray name;
    6363    uint isVolatile : 1;
    … …  
    116116struct PropertyDef
    117117{
    118     PropertyDef():notifyId(-1), gspec(ValueSpec){}
     118    PropertyDef():notifyId(-1), gspec(ValueSpec){}
    119119    QByteArray name, type, read, write, reset, designable, scriptable, editable, stored, user, notify;
    120120    int notifyId;
     121
     122
    121123    enum Specification  { ValueSpec, ReferenceSpec, PointerSpec };
    122124    Specification gspec;
    … …  
    138140struct ClassDef {
    139141    ClassDef():
    140         hasQObject(false), hasQGadget(false), notifyableProperties(0){}
     142        hasQObject(false), hasQGadget(false), notifyableProperties(0){}
    141143    QByteArray classname;
    142144    QByteArray qualified;
    … …  
    178180public:
    179181    Moc()
    180         : noInclude(false), generatedCode(false)
     182        : noInclude(false), generatedCode(false)
    181183        {}
    182184
    … …  
    185187    bool noInclude;
    186188    bool generatedCode;
     189
    187190    QByteArray includePath;
    188191    QList<QByteArray> includeFiles;

  • trunk/src/tools/moc/mwerks_mac.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/src/tools/moc/mwerks_mac.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/src/tools/moc/outputrevision.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**
    … …  
    4444
    4545// if the output revision changes, you MUST change it in qobjectdefs.h too
    46 enum { mocOutputRevision = 61 };          // moc format output revision
     46enum { mocOutputRevision = 6 };          // moc format output revision
    4747
    4848#endif // OUTPUTREVISION_H

  • trunk/src/tools/moc/parser.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/src/tools/moc/parser.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/src/tools/moc/ppkeywords.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/src/tools/moc/preprocessor.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**
    … …  
    808808                    QByteArray frameworkCandidate = include.left(slashPos);
    809809                    frameworkCandidate.append(".framework/Headers/");
    810                     fi.setFile(QString::fromLocal8Bit(p.path + "/" + frameworkCandidate), QString::fromLocal8Bit(include.mid(slashPos + 1)));
     810                    fi.setFile(QString::fromLocal8Bit(p.path + + frameworkCandidate), QString::fromLocal8Bit(include.mid(slashPos + 1)));
    811811                } else {
    812812                    fi.setFile(QString::fromLocal8Bit(p.path), QString::fromLocal8Bit(include));

  • trunk/src/tools/moc/preprocessor.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/src/tools/moc/symbols.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/src/tools/moc/token.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/src/tools/moc/token.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/src/tools/moc/util/generate.sh

    r2 r561  
    11#!/bin/sh
     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
    243qmake
    344make

  • trunk/src/tools/moc/util/generate_keywords.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/src/tools/moc/util/licenseheader.txt

    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/src/tools/moc/utils.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**
Note: See TracChangeset for help on using the changeset viewer.