Changeset 561 for trunk/src/tools


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:
80 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/tools/bootstrap/bootstrap.pri

    r2 r561  
    2929                   $$QT_BUILD_TREE/include/QtCore \
    3030                   $$QT_BUILD_TREE/include/QtXml \
    31                    ../../xml
     31                   $$QT_SOURCE_TREE/src/xml
    3232DEPENDPATH      += $$INCLUDEPATH \
    33                    ../../corelib/global \
    34                    ../../corelib/kernel \
    35                    ../../corelib/tools \
    36                    ../../corelib/io \
    37                    ../../corelib/codecs \
    38                    ../../xml
     33                   $$QT_SOURCE_TREE/src/corelib/global \
     34                   $$QT_SOURCE_TREE/src/corelib/kernel \
     35                   $$QT_SOURCE_TREE/src/corelib/tools \
     36                   $$QT_SOURCE_TREE/src/corelib/io \
     37                   $$QT_SOURCE_TREE/src/corelib/codecs \
     38                   $$QT_SOURCE_TREE/src/xml
    3939
    4040hpux-acc*|hpuxi-acc* {
    41     LIBS += ../bootstrap/libbootstrap.a
     41    LIBS += $$QT_BUILD_TREE/src/tools/bootstrap/libbootstrap.a
    4242} else {
    4343    contains(CONFIG, debug_and_release_target) {
    4444        CONFIG(debug, debug|release) {
    45             LIBS+=-L../bootstrap/debug
     45            LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/debug
    4646        } else {
    47             LIBS+=-L../bootstrap/release
     47            LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/release
    4848        }
    4949    } else {
    50         LIBS += -L../bootstrap
     50        LIBS += -L$$QT_BUILD_TREE/src/tools/bootstrap
    5151    }
    5252    LIBS += -lbootstrap

  • trunk/src/tools/bootstrap/bootstrap.pro

    r60 r561  
    3131INCLUDEPATH += $$QT_BUILD_TREE/include \
    3232            $$QT_BUILD_TREE/include/QtCore \
    33             $$QT_BUILD_TREE/include/QtXml \
     33            $$QT_BUILD_TREE/include/QtXml
    3434
    3535DEPENDPATH += $$INCLUDEPATH \
    … …  
    5353           ../../corelib/io/qabstractfileengine.cpp \
    5454           ../../corelib/io/qbuffer.cpp \
     55           ../../corelib/io/qdatastream.cpp \
    5556           ../../corelib/io/qdir.cpp \
    5657           ../../corelib/io/qdiriterator.cpp \
    … …  
    7071           ../../corelib/tools/qdatetime.cpp \
    7172           ../../corelib/tools/qhash.cpp \
    72            ../../corelib/tools/qlistdata.cpp \
     73           ../../corelib/tools/qlist.cpp \
    7374           ../../corelib/tools/qlocale.cpp \
    7475           ../../corelib/tools/qmap.cpp \
    … …  
    9394                 
    9495macx: {
    95    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported)
     96   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
    9697   SOURCES += ../../corelib/kernel/qcore_mac.cpp
    9798   LIBS += -framework CoreServices

  • trunk/src/tools/idc/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**
    … …  
    4141
    4242#include <QFile>
    43 #include <QSysInfo>
    4443#include <QProcess>
    4544#include <QLibraryInfo>
    … …  
    5150static QString quotePath(const QString &s)
    5251{
    53     if (!s.startsWith(QLatin1String("\"")) && s.contains(QLatin1Char(' ')))
    54         return QLatin1String("\"") + s + QLatin1String("\"");
     52    if (!s.startsWith(QLatin1Char('\"')) && s.contains(QLatin1Char(' ')))
     53        return QLatin1Char('\"') + s + QLatin1Char('\"');
    5554    return s;
    5655}
    … …  
    8887static bool attachTypeLibrary(const QString &applicationName, int resource, const QByteArray &data, QString *errorMessage)
    8988{
    90     HANDLE hExe = 0;
    91     QT_WA({
    92         TCHAR *resourceName = MAKEINTRESOURCEW(resource);
    93         hExe = BeginUpdateResourceW((TCHAR*)applicationName.utf16(), false);
    94         if (hExe == 0) {
    95             if (errorMessage)
    96                 *errorMessage = QString::fromLatin1("Failed to attach type library to binary %1 - could not open file.").arg(applicationName);
    97             return false;
    98         }
    99         if (!UpdateResourceW(hExe,L"TYPELIB",resourceName,0,(void*)data.data(),data.count())) {
    100             EndUpdateResource(hExe, true);
    101             if (errorMessage)
    102                 *errorMessage = QString::fromLatin1("Failed to attach type library to binary %1 - could not update file.").arg(applicationName);
    103             return false;
    104         }
    105     }, {
    106         char *resourceName = MAKEINTRESOURCEA(resource);
    107         hExe = BeginUpdateResourceA(applicationName.toLocal8Bit(), false);
    108         if (hExe == 0) {
    109             if (errorMessage)
    110                 *errorMessage = QString::fromLatin1("Failed to attach type library to binary %1 - could not open file.").arg(applicationName);
    111             return false;
    112         }
    113         if (!UpdateResourceA(hExe,"TYPELIB",resourceName,0,(void*)data.data(),data.count())) {
    114             EndUpdateResource(hExe, true);
    115             if (errorMessage)
    116                 *errorMessage = QString::fromLatin1("Failed to attach type library to binary %1 - could not update file.").arg(applicationName);
    117             return false;
    118         }
    119     });
    120    
     89    HANDLE hExe = BeginUpdateResource((const wchar_t *)applicationName.utf16(), false);
     90    if (hExe == 0) {
     91        if (errorMessage)
     92            *errorMessage = QString::fromLatin1("Failed to attach type library to binary %1 - could not open file.").arg(applicationName);
     93        return false;
     94    }
     95    if (!UpdateResource(hExe, L"TYPELIB", MAKEINTRESOURCE(resource), 0, (void*)data.data(), data.count())) {
     96        EndUpdateResource(hExe, true);
     97        if (errorMessage)
     98            *errorMessage = QString::fromLatin1("Failed to attach type library to binary %1 - could not update file.").arg(applicationName);
     99        return false;
     100    }
     101
    121102    if (!EndUpdateResource(hExe,false)) {
    122103        if (errorMessage)
    … …  
    136117        ok = runWithQtInEnvironment(quotePath(input) + QLatin1String(" -regserver"));
    137118    } else {
    138         HMODULE hdll = 0;
    139         QT_WA({
    140             hdll = LoadLibraryW((TCHAR*)input.utf16());
    141         }, {
    142             hdll = LoadLibraryA(input.toLocal8Bit());
    143         });
     119        HMODULE hdll = LoadLibrary((const wchar_t *)input.utf16());
    144120        if (!hdll) {
    145121            fprintf(stderr, "Couldn't load library file %s\n", (const char*)input.toLocal8Bit().data());
    … …  
    163139        ok = runWithQtInEnvironment(quotePath(input) + QLatin1String(" -unregserver"));
    164140    } else {
    165         HMODULE hdll = 0;
    166         QT_WA({
    167             hdll = LoadLibraryW((TCHAR*)input.utf16());
    168         }, {
    169             hdll = LoadLibraryA(input.toLocal8Bit());
    170         });
     141        HMODULE hdll = LoadLibrary((const wchar_t *)input.utf16());
    171142        if (!hdll) {
    172143            fprintf(stderr, "Couldn't load library file %s\n", (const char*)input.toLocal8Bit().data());
    … …  
    192163            res = S_OK;
    193164    } else {
    194         HMODULE hdll = 0;
    195         QT_WA({
    196             hdll = LoadLibraryW((TCHAR*)input.utf16());
    197         }, {
    198             hdll = LoadLibraryA(input.toLocal8Bit());
    199         });
     165        HMODULE hdll = LoadLibrary((const wchar_t *)input.utf16());
    200166        if (!hdll) {
    201167            fprintf(stderr, "Couldn't load library file %s\n", (const char*)input.toLocal8Bit().data());
    … …  
    255221                version = QLatin1String(argv[i]);
    256222        } else if (p == QLatin1String("/tlb") || p == QLatin1String("-tlb")) {
    257             if (QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)
    258                 fprintf(stderr, "IDC requires Windows NT/2000/XP!\n");
    259            
    260223            ++i;
    261224            if (i > argc) {
    … …  
    283246            return 0;
    284247        } else if (p[0] == QLatin1Char('/') || p[0] == QLatin1Char('-')) {
    285             error = QLatin1String("Unknown option \"") + p + QLatin1String("\"");
     248            error = QLatin1String("Unknown option \"") + p + QLatin1Char('\"');
    286249            break;
    287250        } else {
    … …  
    332295        case S_OK:
    333296            break;
     297        case E_FAIL:
     298            fprintf(stderr, "IDL generation failed trying to run program %s!\n", (const char*)input.toLocal8Bit().data());
     299            return res;
    334300        case -1:
    335301            fprintf(stderr, "Couldn't open %s for writing!\n", (const char*)idlfile.toLocal8Bit().data());

  • 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 (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**
    … …  
    4646#include <stdio.h>
    4747
     48#include <private/qmetaobject_p.h> //for the flags.
     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  Returns true if the type is qreal.
     82*/
     83static bool isQRealType(const char *type)
     84{
     85    return strcmp(type, "qreal") == 0;
    11086}
    11187
    … …  
    195171    qualifiedClassNameIdentifier.replace(':', '_');
    196172
    197     int index = 12;
     173    int index = 14;
    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", 4);
    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    fprintf(out, "    %4d,       // flags\n", 0);
     197    fprintf(out, "    %4d,       // signalCount\n", cdef->signalList.count());
     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        fprintf(out, "#ifdef Q_NO_DATA_RELOCATION\n");
     307        fprintf(out, "static const QMetaObjectAccessor qt_meta_extradata_%s[] = {\n    ", qualifiedClassNameIdentifier.constData());
     308        for (int i = 0; i < extraList.count(); ++i) {
     309            fprintf(out, "    %s::getStaticMetaObject,\n", extraList.at(i).constData());
     310        }
     311        fprintf(out, "#else\n");
    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    if(isQt)
    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 if (!isQRealType(p.type)) {
    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->qualified.constData(), cdef->qualified.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->qualified.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 (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/moc/keywords.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/moc/main.cpp

    r93 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**
    … …  
    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 (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**
    … …  
    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() && !includePath.endsWith('/'))
     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 = '\"' + 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    if (mustIncludeQMetaTypeH)
     769        fprintf(out, "#include <QtCore/qmetatype.h>\n");
    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            warning("Signals cannot be declared virtual");
    863864        if (funcDef.inlineCode)
    864865            error("Not a signal declaration");
    … …  
    899900    else if (type == "ULongLong")
    900901        type = "qulonglong";
     902    else if (type == "qreal")
     903        mustIncludeQMetaTypeH = true;
     904
    901905    propDef.type = type;
    902906
    … …  
    905909    while (test(IDENTIFIER)) {
    906910        QByteArray l = lexem();
     911
     912        if (l[0] == 'C' && l == "CONSTANT") {
     913            propDef.constant = true;
     914            continue;
     915        } else if(l[0] == 'F' && l == "FINAL") {
     916            propDef.final = true;
     917            continue;
     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 (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**
    … …  
    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), isScoped(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), constant(false), final(false), gspec(ValueSpec){}
    119119    QByteArray name, type, read, write, reset, designable, scriptable, editable, stored, user, notify;
    120120    int notifyId;
     121    bool constant;
     122    bool final;
    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), begin(0), end(0){}
    141143    QByteArray classname;
    142144    QByteArray qualified;
    … …  
    178180public:
    179181    Moc()
    180         : noInclude(false), generatedCode(false)
     182        : noInclude(false), generatedCode(false), mustIncludeQMetaTypeH(false)
    181183        {}
    182184
    … …  
    185187    bool noInclude;
    186188    bool generatedCode;
     189    bool mustIncludeQMetaTypeH;
    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 (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/moc/mwerks_mac.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**

  • 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 (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**
    … …  
    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 = 62 };          // 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 (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/moc/parser.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**

  • 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 (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/moc/preprocessor.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**
    … …  
    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 (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/moc/symbols.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**

  • 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 (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/moc/token.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**

  • trunk/src/tools/moc/util/generate.sh

    r2 r561  
    11#!/bin/sh
     2#############################################################################
     3##
     4## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
     5## All rights reserved.
     6## Contact: Nokia Corporation (qt-info@nokia.com)
     7##
     8## This file is the build configuration utility of the Qt Toolkit.
     9##
     10## $QT_BEGIN_LICENSE:LGPL$
     11## Commercial Usage
     12## Licensees holding valid Qt Commercial licenses may use this file in
     13## accordance with the Qt Commercial License Agreement provided with the
     14## Software or, alternatively, in accordance with the terms contained in
     15## a written agreement between you and Nokia.
     16##
     17## GNU Lesser General Public License Usage
     18## Alternatively, this file may be used under the terms of the GNU Lesser
     19## General Public License version 2.1 as published by the Free Software
     20## Foundation and appearing in the file LICENSE.LGPL included in the
     21## packaging of this file.  Please review the following information to
     22## ensure the GNU Lesser General Public License version 2.1 requirements
     23## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
     24##
     25## In addition, as a special exception, Nokia gives you certain additional
     26## rights.  These rights are described in the Nokia Qt LGPL Exception
     27## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
     28##
     29## GNU General Public License Usage
     30## Alternatively, this file may be used under the terms of the GNU
     31## General Public License version 3.0 as published by the Free Software
     32## Foundation and appearing in the file LICENSE.GPL included in the
     33## packaging of this file.  Please review the following information to
     34## ensure the GNU General Public License version 3.0 requirements will be
     35## met: http://www.gnu.org/copyleft/gpl.html.
     36##
     37## If you have questions regarding the use of this file, please contact
     38## Nokia at qt-info@nokia.com.
     39## $QT_END_LICENSE$
     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 (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/moc/util/licenseheader.txt

    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/moc/utils.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**

  • 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**

  • trunk/src/tools/uic/cpp/cppextractimages.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/uic/cpp/cppextractimages.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**

  • trunk/src/tools/uic/cpp/cppwritedeclaration.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/uic/cpp/cppwritedeclaration.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**

  • trunk/src/tools/uic/cpp/cppwriteicondata.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**
    … …  
    162162            output << "0x" << QString(data[2*a]) << QString(data[2*a+1]) << ',';
    163163            if (a % 12 == 11)
    164                 output << "\n" << indent;
     164                output << '\n' << indent;
    165165            else
    166                 output << " ";
     166                output << ' ';
    167167        }
    168168        output << "0x" << QString(data[2*a]) << QString(data[2*a+1]) << '\n';

  • trunk/src/tools/uic/cpp/cppwriteicondata.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**

  • trunk/src/tools/uic/cpp/cppwriteicondeclaration.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/uic/cpp/cppwriteicondeclaration.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**

  • trunk/src/tools/uic/cpp/cppwriteiconinitialization.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/uic/cpp/cppwriteiconinitialization.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**

  • trunk/src/tools/uic/cpp/cppwriteincludes.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/uic/cpp/cppwriteincludes.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**

  • trunk/src/tools/uic/cpp/cppwriteinitialization.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**
    … …  
    392392}
    393393
     394static inline void writeContentsMargins(const QString &indent, const QString &objectName, int value, QTextStream &str)
     395{
     396     QString contentsMargins;
     397     QTextStream(&contentsMargins) << value << ", " << value << ", " << value << ", " << value;
     398     writeSetter(indent, objectName, QLatin1String("setContentsMargins"), contentsMargins, str);
     399 }
     400
    394401void WriteInitialization::LayoutDefaultHandler::writeProperty(int p, const QString &indent, const QString &objectName,
    395402                                                              const DomPropertyMap &properties, const QString &propertyName, const QString &setter,
    … …  
    409416            if (ifndefMac)
    410417                str << "#ifndef Q_OS_MAC\n";
    411             writeSetter(indent, objectName, setter, value, str);
     418            if (p == Margin) { // Use setContentsMargins for numeric values
     419                writeContentsMargins(indent, objectName, value, str);
     420            } else {
     421                writeSetter(indent, objectName, setter, value, str);
     422            }
    412423            if (ifndefMac)
    413424                str << "#endif\n";
    … …  
    417428    if (suppressDefault)
    418429        return;
    419     // get default
     430    // get default.
    420431    if (m_state[p] & HasDefaultFunction) {
     432        // Do not use setContentsMargins to avoid repetitive evaluations.
    421433        writeSetter(indent, objectName, setter, m_functions[p], str);
    422434        return;
    423435    }
    424436    if (m_state[p] & HasDefaultValue) {
    425         writeSetter(indent, objectName, setter, m_defaultValues[p], str);
     437        if (p == Margin) { // Use setContentsMargins for numeric values
     438            writeContentsMargins(indent, objectName, m_defaultValues[p], str);
     439        } else {
     440            writeSetter(indent, objectName, setter, m_defaultValues[p], str);
     441        }
    426442    }
    427443    return;
    … …  
    459475      m_stdsetdef(true),
    460476      m_layoutMarginType(TopLevelMargin),
     477      m_mainFormUsedInRetranslateUi(false),
    461478      m_delayedOut(&m_delayedInitialization, QIODevice::WriteOnly),
    462479      m_refreshOut(&m_refreshInitialization, QIODevice::WriteOnly),
    … …  
    554571    m_output << m_option.indent << "} // setupUi\n\n";
    555572
    556     if (m_delayedActionInitialization.isEmpty()) {
     573    if (!m_mainFormUsedInRetranslateUi) {
    557574        m_refreshInitialization += m_indent;
    558575        m_refreshInitialization += QLatin1String("Q_UNUSED(");
    559576        m_refreshInitialization += varName ;
    560         m_refreshInitialization +=QLatin1String(");\n");
     577        m_refreshInitialization += QLatin1String(");\n");
    561578    }
    562579
    … …  
    654671    m_layoutWidget = false;
    655672    if (className == QLatin1String("QWidget") && !node->hasAttributeNative()) {
    656         if (m_widgetChain.top()
    657             && m_widgetChain.top()->attributeClass() != QLatin1String("QMainWindow")
    658             && !m_uic->isContainer(m_widgetChain.top()->attributeClass()))
     673        if (const DomWidget* parentWidget = m_widgetChain.top()) {
     674            const QString parentClass = parentWidget->attributeClass();
     675            if (parentClass != QLatin1String("QMainWindow")
     676                && !m_uic->isCustomWidgetContainer(parentClass)
     677                && !m_uic->isContainer(parentClass))
    659678            m_layoutWidget = true;
     679        }
    660680    }
    661681    m_widgetChain.push(node);
    … …  
    702722        } else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QStatusBar"))) {
    703723            m_output << m_indent << parentWidget << "->setStatusBar(" << varName << ");\n";
    704         } else if (className == QLatin1String("QWidget")) {
     724        } else {
    705725            m_output << m_indent << parentWidget << "->setCentralWidget(" << varName << ");\n";
    706726        }
    … …  
    15161536            if (defineC)
    15171537                closeIfndef(o, QLatin1String(defineC));
     1538
     1539            if (varName == m_mainFormVarName && &o == &m_refreshOut) {
     1540                // this is the only place (currently) where we output mainForm name to the retranslateUi().
     1541                // Other places output merely instances of a certain class (which cannot be main form, e.g. QListWidget).
     1542                m_mainFormUsedInRetranslateUi = true;
     1543            }
    15181544        }
    15191545    }
    … …  
    16491675        m_output << m_indent << "QIcon " << iconName << ";\n";
    16501676        if (i->hasElementNormalOff())
    1651             m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementNormalOff()->text()) << ", QIcon::Normal, QIcon::Off);\n";
     1677            m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOff()->text(), m_dindent) << "), QSize(), QIcon::Normal, QIcon::Off);\n";
    16521678        if (i->hasElementNormalOn())
    1653             m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementNormalOn()->text()) << ", QIcon::Normal, QIcon::On);\n";
     1679            m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementNormalOn()->text(), m_dindent) << "), QSize(), QIcon::Normal, QIcon::On);\n";
    16541680        if (i->hasElementDisabledOff())
    1655             m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementDisabledOff()->text()) << ", QIcon::Disabled, QIcon::Off);\n";
     1681            m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementDisabledOff()->text(), m_dindent) << "), QSize(), QIcon::Disabled, QIcon::Off);\n";
    16561682        if (i->hasElementDisabledOn())
    1657             m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementDisabledOn()->text()) << ", QIcon::Disabled, QIcon::On);\n";
     1683            m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementDisabledOn()->text(), m_dindent) << "), QSize(), QIcon::Disabled, QIcon::On);\n";
    16581684        if (i->hasElementActiveOff())
    1659             m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementActiveOff()->text()) << ", QIcon::Active, QIcon::Off);\n";
     1685            m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementActiveOff()->text(), m_dindent) << "), QSize(), QIcon::Active, QIcon::Off);\n";
    16601686        if (i->hasElementActiveOn())
    1661             m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementActiveOn()->text()) << ", QIcon::Active, QIcon::On);\n";
     1687            m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementActiveOn()->text(), m_dindent) << "), QSize(), QIcon::Active, QIcon::On);\n";
    16621688        if (i->hasElementSelectedOff())
    1663             m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementSelectedOff()->text()) << ", QIcon::Selected, QIcon::Off);\n";
     1689            m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementSelectedOff()->text(), m_dindent) << "), QSize(), QIcon::Selected, QIcon::Off);\n";
    16641690        if (i->hasElementSelectedOn())
    1665             m_output << m_indent << iconName << ".addPixmap(" << pixCall(pixmap, i->elementSelectedOn()->text()) << ", QIcon::Selected, QIcon::On);\n";
     1691            m_output << m_indent << iconName << ".addFile(QString::fromUtf8(" << fixString(i->elementSelectedOn()->text(), m_dindent) << "), QSize(), QIcon::Selected, QIcon::On);\n";
    16661692    } else { // pre-4.4 legacy
    16671693        m_output <<  m_indent << "const QIcon " << iconName << " = " << pixCall(QLatin1String("QIcon"), i->text())<< ";\n";
    … …  
    26842710        << sender
    26852711        << ", "
    2686         << "SIGNAL(" << connection->elementSignal() << ')'
     2712        << "SIGNAL("<<connection->elementSignal()<<')'
    26872713        << ", "
    26882714        << receiver
    26892715        << ", "
    2690         << "SLOT(" << connection->elementSlot() << ')'
     2716        << "SLOT("<<connection->elementSlot()<<')'
    26912717        << ");\n";
    26922718}
    … …  
    28142840    if (emptyItemPolicy == Item::ConstructItemOnly && m_children.size() == 0) {
    28152841        if (m_setupUiData.policy == ItemData::DontGenerate) {
    2816             m_setupUiStream << m_indent << "new " << m_itemClassName << "(" << parent << ");\n";
     2842            m_setupUiStream << m_indent << "new " << m_itemClassName << '(' << parent << ");\n";
    28172843                return QString();
    28182844        } else if (m_setupUiData.policy == ItemData::GenerateWithMultiDirective) {
    … …  
    28252851
    28262852    const QString uniqueName = m_driver->unique(QLatin1String("__") + m_itemClassName.toLower());
    2827     m_setupUiStream << m_indent << m_itemClassName << " *" << uniqueName << " = new " << m_itemClassName << "(" << parent << ");\n";
     2853    m_setupUiStream << m_indent << m_itemClassName << " *" << uniqueName << " = new " << m_itemClassName << '(' << parent << ");\n";
    28282854
    28292855    if (generateMultiDirective) {
    28302856        m_setupUiStream << "#else\n";
    2831         m_setupUiStream << m_indent << "new " << m_itemClassName << "(" << parent << ");\n";
     2857        m_setupUiStream << m_indent << "new " << m_itemClassName << '(' << parent << ");\n";
    28322858        generateMultiDirectiveEnd(m_setupUiStream, m_setupUiData.directives);
    28332859    }

  • trunk/src/tools/uic/cpp/cppwriteinitialization.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**
    … …  
    351351    QString m_generatedClass;
    352352    QString m_mainFormVarName;
     353    bool m_mainFormUsedInRetranslateUi;
    353354
    354355    QString m_delayedInitialization;

  • trunk/src/tools/uic/customwidgetsinfo.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**
    … …  
    8989}
    9090
     91bool CustomWidgetsInfo::isCustomWidgetContainer(const QString &className) const
     92{
     93    if (const DomCustomWidget *dcw = m_customWidgets.value(className, 0))
     94        if (dcw->hasElementContainer())
     95            return dcw->elementContainer() != 0;
     96    return false;
     97}
     98
    9199QString CustomWidgetsInfo::realClassName(const QString &className) const
    92100{

  • trunk/src/tools/uic/customwidgetsinfo.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**
    … …  
    7979    bool extends(const QString &className, const QLatin1String &baseClassName) const;
    8080
     81    bool isCustomWidgetContainer(const QString &className) const;
     82
    8183private:
    8284    typedef QMap<QString, DomCustomWidget*> NameCustomWidgetMap;

  • trunk/src/tools/uic/databaseinfo.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/uic/databaseinfo.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**

  • trunk/src/tools/uic/driver.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/uic/driver.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**

  • trunk/src/tools/uic/globaldefs.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**

  • trunk/src/tools/uic/main.cpp

    r88 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**
    … …  
    139139    }
    140140
    141     // report Qt usage for commercial customers with a "metered license" (currently experimental)
    142 #if QT_EDITION != QT_EDITION_OPENSOURCE
    143 #ifdef QT_CONFIGURE_BINARIES_PATH
    144     const char *binariesPath = QT_CONFIGURE_BINARIES_PATH;
    145     QString reporterPath = QString::fromLocal8Bit(binariesPath);
    146     reporterPath += QDir::separator();
    147     reporterPath += QLatin1String("qtusagereporter");
    148 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
    149     reporterPath += QLatin1String(".exe");
    150 #endif
    151     if (QFile::exists(reporterPath))
    152         system(qPrintable(reporterPath + QLatin1String(" uic")));
    153 #endif
    154 #endif
    155 
    156141    QString inputFile;
    157142    if (fileName)

  • trunk/src/tools/uic/option.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**

  • trunk/src/tools/uic/qclass_lib_map.h

    r2 r561  
    1 QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h)
    2 QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h)
    3 QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h)
    4 QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h)
    5 QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h)
    6 QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
    7 QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h)
    8 QT_CLASS_LIB(QMutableFutureIterator, QtCore, qfuture.h)
    9 QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
    10 QT_CLASS_LIB(QFutureInterfaceBase, QtCore, qfutureinterface.h)
    11 QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h)
    12 QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h)
    13 QT_CLASS_LIB(QFutureSynchronizer, QtCore, qfuturesynchronizer.h)
    14 QT_CLASS_LIB(QFutureWatcherBase, QtCore, qfuturewatcher.h)
    15 QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h)
    16 QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h)
    17 QT_CLASS_LIB(QRunnable, QtCore, qrunnable.h)
    18 QT_CLASS_LIB(QtConcurrentFilter, QtCore, qtconcurrentfilter.h)
    19 QT_CLASS_LIB(QtConcurrentMap, QtCore, qtconcurrentmap.h)
    20 QT_CLASS_LIB(QtConcurrentRun, QtCore, qtconcurrentrun.h)
    21 QT_CLASS_LIB(QThreadPool, QtCore, qthreadpool.h)
    22 QT_CLASS_LIB(QtEndian, QtCore, qendian.h)
    23 QT_CLASS_LIB(QtGlobal, QtCore, qglobal.h)
    24 QT_CLASS_LIB(QUintForSize, QtCore, qglobal.h)
    25 QT_CLASS_LIB(QUintForSize, QtCore, qglobal.h)
    26 QT_CLASS_LIB(QUintForSize, QtCore, qglobal.h)
    27 QT_CLASS_LIB(QUintForType, QtCore, qglobal.h)
    28 QT_CLASS_LIB(QIntForSize, QtCore, qglobal.h)
    29 QT_CLASS_LIB(QIntForSize, QtCore, qglobal.h)
    30 QT_CLASS_LIB(QIntForSize, QtCore, qglobal.h)
    31 QT_CLASS_LIB(QIntForType, QtCore, qglobal.h)
    32 QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h)
    33 QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h)
    34 QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h)
    35 QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h)
    36 QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h)
    37 QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h)
    38 QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h)
    39 QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h)
    40 QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h)
    41 QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h)
    42 QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h)
    43 QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
    44 QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
    45 QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
    46 QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
    47 QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h)
    48 QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h)
    49 QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
    50 QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
    51 QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h)
    52 QT_CLASS_LIB(QBool, QtCore, qglobal.h)
    53 QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
    54 QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
    55 QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
    56 QT_CLASS_LIB(QFlag, QtCore, qglobal.h)
    57 QT_CLASS_LIB(QIncompatibleFlag, QtCore, qglobal.h)
    58 QT_CLASS_LIB(QFlags, QtCore, qglobal.h)
    59 QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
    60 QT_CLASS_LIB(QForeachContainerBase, QtCore, qglobal.h)
    61 QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
    62 QT_CLASS_LIB(QLibraryInfo, QtCore, qlibraryinfo.h)
    63 QT_CLASS_LIB(Qt, QtCore, qnamespace.h)
    64 QT_CLASS_LIB(QInternal, QtCore, qnamespace.h)
    65 QT_CLASS_LIB(QCOORD, QtCore, qnamespace.h)
     1QT_CLASS_LIB(QXmlStreamStringRef, QtCore, qxmlstream.h)
     2QT_CLASS_LIB(QXmlStreamAttribute, QtCore, qxmlstream.h)
     3QT_CLASS_LIB(QXmlStreamAttributes, QtCore, qxmlstream.h)
     4QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtCore, qxmlstream.h)
     5QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtCore, qxmlstream.h)
     6QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtCore, qxmlstream.h)
     7QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtCore, qxmlstream.h)
     8QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtCore, qxmlstream.h)
     9QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtCore, qxmlstream.h)
     10QT_CLASS_LIB(QXmlStreamEntityResolver, QtCore, qxmlstream.h)
     11QT_CLASS_LIB(QXmlStreamReader, QtCore, qxmlstream.h)
     12QT_CLASS_LIB(QXmlStreamWriter, QtCore, qxmlstream.h)
    6613QT_CLASS_LIB(QAbstractFileEngine, QtCore, qabstractfileengine.h)
    6714QT_CLASS_LIB(QAbstractFileEngineHandler, QtCore, qabstractfileengine.h)
    … …  
    8229QT_CLASS_LIB(QIODevice, QtCore, qiodevice.h)
    8330QT_CLASS_LIB(Q_PID, QtCore, qprocess.h)
     31QT_CLASS_LIB(QProcessEnvironment, QtCore, qprocess.h)
    8432QT_CLASS_LIB(QProcess, QtCore, qprocess.h)
    8533QT_CLASS_LIB(QResource, QtCore, qresource.h)
    … …  
    9341QT_CLASS_LIB(QTextOStream, QtCore, qtextstream.h)
    9442QT_CLASS_LIB(QUrl, QtCore, qurl.h)
    95 QT_CLASS_LIB(QAbstractEventDispatcher, QtCore, qabstracteventdispatcher.h)
    96 QT_CLASS_LIB(QModelIndex, QtCore, qabstractitemmodel.h)
    97 QT_CLASS_LIB(QPersistentModelIndex, QtCore, qabstractitemmodel.h)
    98 QT_CLASS_LIB(QModelIndexList, QtCore, qabstractitemmodel.h)
    99 QT_CLASS_LIB(QAbstractItemModel, QtCore, qabstractitemmodel.h)
    100 QT_CLASS_LIB(QAbstractTableModel, QtCore, qabstractitemmodel.h)
    101 QT_CLASS_LIB(QAbstractListModel, QtCore, qabstractitemmodel.h)
    102 QT_CLASS_LIB(QBasicTimer, QtCore, qbasictimer.h)
    103 QT_CLASS_LIB(QCoreApplication, QtCore, qcoreapplication.h)
    104 QT_CLASS_LIB(QtCleanUpFunction, QtCore, qcoreapplication.h)
    105 QT_CLASS_LIB(QEvent, QtCore, qcoreevent.h)
    106 QT_CLASS_LIB(QTimerEvent, QtCore, qcoreevent.h)
    107 QT_CLASS_LIB(QChildEvent, QtCore, qcoreevent.h)
    108 QT_CLASS_LIB(QCustomEvent, QtCore, qcoreevent.h)
    109 QT_CLASS_LIB(QDynamicPropertyChangeEvent, QtCore, qcoreevent.h)
    110 QT_CLASS_LIB(QEventLoop, QtCore, qeventloop.h)
    111 QT_CLASS_LIB(QMetaMethod, QtCore, qmetaobject.h)
    112 QT_CLASS_LIB(QMetaEnum, QtCore, qmetaobject.h)
    113 QT_CLASS_LIB(QMetaProperty, QtCore, qmetaobject.h)
    114 QT_CLASS_LIB(QMetaClassInfo, QtCore, qmetaobject.h)
    115 QT_CLASS_LIB(QMetaType, QtCore, qmetatype.h)
    116 QT_CLASS_LIB(QMetaTypeId, QtCore, qmetatype.h)
    117 QT_CLASS_LIB(QMetaTypeId2, QtCore, qmetatype.h)
    118 QT_CLASS_LIB(QMimeData, QtCore, qmimedata.h)
    119 QT_CLASS_LIB(QObjectList, QtCore, qobject.h)
    120 QT_CLASS_LIB(QObjectData, QtCore, qobject.h)
    121 QT_CLASS_LIB(QObject, QtCore, qobject.h)
    122 QT_CLASS_LIB(QObjectUserData, QtCore, qobject.h)
    123 QT_CLASS_LIB(QObjectCleanupHandler, QtCore, qobjectcleanuphandler.h)
    124 QT_CLASS_LIB(QGenericArgument, QtCore, qobjectdefs.h)
    125 QT_CLASS_LIB(QGenericReturnArgument, QtCore, qobjectdefs.h)
    126 QT_CLASS_LIB(QArgument, QtCore, qobjectdefs.h)
    127 QT_CLASS_LIB(QReturnArgument, QtCore, qobjectdefs.h)
    128 QT_CLASS_LIB(QMetaObject, QtCore, qobjectdefs.h)
    129 QT_CLASS_LIB(QMetaObjectExtraData, QtCore, qobjectdefs.h)
    130 QT_CLASS_LIB(QPointer, QtCore, qpointer.h)
    131 QT_CLASS_LIB(QSharedMemory, QtCore, qsharedmemory.h)
    132 QT_CLASS_LIB(QSignalMapper, QtCore, qsignalmapper.h)
    133 QT_CLASS_LIB(QSocketNotifier, QtCore, qsocketnotifier.h)
    134 QT_CLASS_LIB(QSystemSemaphore, QtCore, qsystemsemaphore.h)
    135 QT_CLASS_LIB(QTimer, QtCore, qtimer.h)
    136 QT_CLASS_LIB(QTranslator, QtCore, qtranslator.h)
    137 QT_CLASS_LIB(QVariant, QtCore, qvariant.h)
    138 QT_CLASS_LIB(QVariantList, QtCore, qvariant.h)
    139 QT_CLASS_LIB(QVariantMap, QtCore, qvariant.h)
    140 QT_CLASS_LIB(QVariantHash, QtCore, qvariant.h)
    141 QT_CLASS_LIB(QVariantComparisonHelper, QtCore, qvariant.h)
    142 QT_CLASS_LIB(QFactoryInterface, QtCore, qfactoryinterface.h)
    143 QT_CLASS_LIB(QLibrary, QtCore, qlibrary.h)
    144 QT_CLASS_LIB(QtPlugin, QtCore, qplugin.h)
    145 QT_CLASS_LIB(QtPluginInstanceFunction, QtCore, qplugin.h)
    146 QT_CLASS_LIB(QPluginLoader, QtCore, qpluginloader.h)
    147 QT_CLASS_LIB(QUuid, QtCore, quuid.h)
    148 QT_CLASS_LIB(QAtomicInt, QtCore, qatomic.h)
    149 QT_CLASS_LIB(QAtomicPointer, QtCore, qatomic.h)
    150 QT_CLASS_LIB(QBasicAtomicInt, QtCore, qbasicatomic.h)
    151 QT_CLASS_LIB(QBasicAtomicPointer, QtCore, qbasicatomic.h)
    152 QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
    153 QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
    154 QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
    155 QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
    156 QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
    157 QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
    158 QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
    159 QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
    160 QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
    161 QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
    162 QT_CLASS_LIB(QSemaphore, QtCore, qsemaphore.h)
    163 QT_CLASS_LIB(QThread, QtCore, qthread.h)
    164 QT_CLASS_LIB(QThread, QtCore, qthread.h)
    165 QT_CLASS_LIB(QThreadStorageData, QtCore, qthreadstorage.h)
    166 QT_CLASS_LIB(QThreadStorage, QtCore, qthreadstorage.h)
    167 QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
    168 QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
     43QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h)
     44QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h)
     45QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h)
     46QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h)
     47QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h)
    16948QT_CLASS_LIB(QtAlgorithms, QtCore, qalgorithms.h)
    17049QT_CLASS_LIB(QBitArray, QtCore, qbitarray.h)
    … …  
    17756QT_CLASS_LIB(QChar, QtCore, qchar.h)
    17857QT_CLASS_LIB(QtContainerFwd, QtCore, qcontainerfwd.h)
     58QT_CLASS_LIB(QContiguousCacheData, QtCore, qcontiguouscache.h)
     59QT_CLASS_LIB(QContiguousCacheTypedData, QtCore, qcontiguouscache.h)
     60QT_CLASS_LIB(QContiguousCache, QtCore, qcontiguouscache.h)
    17961QT_CLASS_LIB(QCryptographicHash, QtCore, qcryptographichash.h)
    18062QT_CLASS_LIB(QDate, QtCore, qdatetime.h)
    18163QT_CLASS_LIB(QTime, QtCore, qdatetime.h)
    18264QT_CLASS_LIB(QDateTime, QtCore, qdatetime.h)
     65QT_CLASS_LIB(QEasingCurve, QtCore, qeasingcurve.h)
    18366QT_CLASS_LIB(QHashData, QtCore, qhash.h)
    18467QT_CLASS_LIB(QHashDummyValue, QtCore, qhash.h)
    … …  
    217100QT_CLASS_LIB(QMapIterator, QtCore, qmap.h)
    218101QT_CLASS_LIB(QMutableMapIterator, QtCore, qmap.h)
     102QT_CLASS_LIB(QMargins, QtCore, qmargins.h)
    219103QT_CLASS_LIB(QPair, QtCore, qpair.h)
    220104QT_CLASS_LIB(QPoint, QtCore, qpoint.h)
    … …  
    224108QT_CLASS_LIB(QRectF, QtCore, qrect.h)
    225109QT_CLASS_LIB(QRegExp, QtCore, qregexp.h)
     110QT_CLASS_LIB(QScopedPointerDeleter, QtCore, qscopedpointer.h)
     111QT_CLASS_LIB(QScopedPointerArrayDeleter, QtCore, qscopedpointer.h)
     112QT_CLASS_LIB(QScopedPointerPodDeleter, QtCore, qscopedpointer.h)
     113QT_CLASS_LIB(QScopedPointer, QtCore, qscopedpointer.h)
     114QT_CLASS_LIB(QScopedArrayPointer, QtCore, qscopedpointer.h)
    226115QT_CLASS_LIB(QSet, QtCore, qset.h)
    227116QT_CLASS_LIB(QSetIterator, QtCore, qset.h)
    … …  
    242131QT_CLASS_LIB(QConstString, QtCore, qstring.h)
    243132QT_CLASS_LIB(QStringRef, QtCore, qstring.h)
     133QT_CLASS_LIB(QLatin1Literal, QtCore, qstringbuilder.h)
     134QT_CLASS_LIB(QAbstractConcatenable, QtCore, qstringbuilder.h)
     135QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     136QT_CLASS_LIB(QStringBuilder, QtCore, qstringbuilder.h)
     137QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     138QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     139QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     140QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     141QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     142QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     143QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     144QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     145QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     146QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
     147QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
    244148QT_CLASS_LIB(QStringListIterator, QtCore, qstringlist.h)
    245149QT_CLASS_LIB(QMutableStringListIterator, QtCore, qstringlist.h)
    … …  
    256160QT_CLASS_LIB(QVectorIterator, QtCore, qvector.h)
    257161QT_CLASS_LIB(QMutableVectorIterator, QtCore, qvector.h)
    258 QT_CLASS_LIB(QXmlStreamStringRef, QtCore, qxmlstream.h)
    259 QT_CLASS_LIB(QXmlStreamAttribute, QtCore, qxmlstream.h)
    260 QT_CLASS_LIB(QXmlStreamAttributes, QtCore, qxmlstream.h)
    261 QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtCore, qxmlstream.h)
    262 QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtCore, qxmlstream.h)
    263 QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtCore, qxmlstream.h)
    264 QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtCore, qxmlstream.h)
    265 QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtCore, qxmlstream.h)
    266 QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtCore, qxmlstream.h)
    267 QT_CLASS_LIB(QXmlStreamEntityResolver, QtCore, qxmlstream.h)
    268 QT_CLASS_LIB(QXmlStreamReader, QtCore, qxmlstream.h)
    269 QT_CLASS_LIB(QXmlStreamWriter, QtCore, qxmlstream.h)
     162QT_CLASS_LIB(QtEndian, QtCore, qendian.h)
     163QT_CLASS_LIB(QtGlobal, QtCore, qglobal.h)
     164QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     165QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     166QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     167QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     168QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     169QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h)
     170QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h)
     171QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h)
     172QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h)
     173QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h)
     174QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h)
     175QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h)
     176QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h)
     177QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h)
     178QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h)
     179QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h)
     180QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
     181QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
     182QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
     183QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
     184QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h)
     185QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h)
     186QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
     187QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
     188QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h)
     189QT_CLASS_LIB(QBool, QtCore, qglobal.h)
     190QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
     191QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
     192QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
     193QT_CLASS_LIB(QFlag, QtCore, qglobal.h)
     194QT_CLASS_LIB(QIncompatibleFlag, QtCore, qglobal.h)
     195QT_CLASS_LIB(QFlags, QtCore, qglobal.h)
     196QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
     197QT_CLASS_LIB(QForeachContainerBase, QtCore, qglobal.h)
     198QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
     199QT_CLASS_LIB(QLibraryInfo, QtCore, qlibraryinfo.h)
     200QT_CLASS_LIB(Qt, QtCore, qnamespace.h)
     201QT_CLASS_LIB(QInternal, QtCore, qnamespace.h)
     202QT_CLASS_LIB(QCOORD, QtCore, qnamespace.h)
     203QT_CLASS_LIB(QAbstractEventDispatcher, QtCore, qabstracteventdispatcher.h)
     204QT_CLASS_LIB(QModelIndex, QtCore, qabstractitemmodel.h)
     205QT_CLASS_LIB(QPersistentModelIndex, QtCore, qabstractitemmodel.h)
     206QT_CLASS_LIB(QModelIndexList, QtCore, qabstractitemmodel.h)
     207QT_CLASS_LIB(QAbstractItemModel, QtCore, qabstractitemmodel.h)
     208QT_CLASS_LIB(QAbstractTableModel, QtCore, qabstractitemmodel.h)
     209QT_CLASS_LIB(QAbstractListModel, QtCore, qabstractitemmodel.h)
     210QT_CLASS_LIB(QBasicTimer, QtCore, qbasictimer.h)
     211QT_CLASS_LIB(QCoreApplication, QtCore, qcoreapplication.h)
     212QT_CLASS_LIB(QtCleanUpFunction, QtCore, qcoreapplication.h)
     213QT_CLASS_LIB(QEvent, QtCore, qcoreevent.h)
     214QT_CLASS_LIB(QTimerEvent, QtCore, qcoreevent.h)
     215QT_CLASS_LIB(QChildEvent, QtCore, qcoreevent.h)
     216QT_CLASS_LIB(QCustomEvent, QtCore, qcoreevent.h)
     217QT_CLASS_LIB(QDynamicPropertyChangeEvent, QtCore, qcoreevent.h)
     218QT_CLASS_LIB(QEventLoop, QtCore, qeventloop.h)
     219QT_CLASS_LIB(QMetaMethod, QtCore, qmetaobject.h)
     220QT_CLASS_LIB(QMetaEnum, QtCore, qmetaobject.h)
     221QT_CLASS_LIB(QMetaProperty, QtCore, qmetaobject.h)
     222QT_CLASS_LIB(QMetaClassInfo, QtCore, qmetaobject.h)
     223QT_CLASS_LIB(QMetaType, QtCore, qmetatype.h)
     224QT_CLASS_LIB(QMetaTypeId, QtCore, qmetatype.h)
     225QT_CLASS_LIB(QMetaTypeId2, QtCore, qmetatype.h)
     226QT_CLASS_LIB(QMimeData, QtCore, qmimedata.h)
     227QT_CLASS_LIB(QObjectList, QtCore, qobject.h)
     228QT_CLASS_LIB(QObjectData, QtCore, qobject.h)
     229QT_CLASS_LIB(QObject, QtCore, qobject.h)
     230QT_CLASS_LIB(QObjectUserData, QtCore, qobject.h)
     231QT_CLASS_LIB(QObjectCleanupHandler, QtCore, qobjectcleanuphandler.h)
     232QT_CLASS_LIB(QGenericArgument, QtCore, qobjectdefs.h)
     233QT_CLASS_LIB(QGenericReturnArgument, QtCore, qobjectdefs.h)
     234QT_CLASS_LIB(QArgument, QtCore, qobjectdefs.h)
     235QT_CLASS_LIB(QReturnArgument, QtCore, qobjectdefs.h)
     236QT_CLASS_LIB(QMetaObject, QtCore, qobjectdefs.h)
     237QT_CLASS_LIB(QMetaObjectAccessor, QtCore, qobjectdefs.h)
     238QT_CLASS_LIB(QMetaObjectExtraData, QtCore, qobjectdefs.h)
     239QT_CLASS_LIB(QPointer, QtCore, qpointer.h)
     240QT_CLASS_LIB(QSharedMemory, QtCore, qsharedmemory.h)
     241QT_CLASS_LIB(QSignalMapper, QtCore, qsignalmapper.h)
     242QT_CLASS_LIB(QSocketNotifier, QtCore, qsocketnotifier.h)
     243QT_CLASS_LIB(QSystemSemaphore, QtCore, qsystemsemaphore.h)
     244QT_CLASS_LIB(QTimer, QtCore, qtimer.h)
     245QT_CLASS_LIB(QTranslator, QtCore, qtranslator.h)
     246QT_CLASS_LIB(QVariant, QtCore, qvariant.h)
     247QT_CLASS_LIB(QVariantList, QtCore, qvariant.h)
     248QT_CLASS_LIB(QVariantMap, QtCore, qvariant.h)
     249QT_CLASS_LIB(QVariantHash, QtCore, qvariant.h)
     250QT_CLASS_LIB(QVariantComparisonHelper, QtCore, qvariant.h)
     251QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
     252QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h)
     253QT_CLASS_LIB(QMutableFutureIterator, QtCore, qfuture.h)
     254QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
     255QT_CLASS_LIB(QFutureInterfaceBase, QtCore, qfutureinterface.h)
     256QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h)
     257QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h)
     258QT_CLASS_LIB(QFutureSynchronizer, QtCore, qfuturesynchronizer.h)
     259QT_CLASS_LIB(QFutureWatcherBase, QtCore, qfuturewatcher.h)
     260QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h)
     261QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h)
     262QT_CLASS_LIB(QRunnable, QtCore, qrunnable.h)
     263QT_CLASS_LIB(QtConcurrentFilter, QtCore, qtconcurrentfilter.h)
     264QT_CLASS_LIB(QtConcurrentMap, QtCore, qtconcurrentmap.h)
     265QT_CLASS_LIB(QtConcurrentRun, QtCore, qtconcurrentrun.h)
     266QT_CLASS_LIB(QThreadPool, QtCore, qthreadpool.h)
     267QT_CLASS_LIB(QFactoryInterface, QtCore, qfactoryinterface.h)
     268QT_CLASS_LIB(QLibrary, QtCore, qlibrary.h)
     269QT_CLASS_LIB(QtPlugin, QtCore, qplugin.h)
     270QT_CLASS_LIB(QtPluginInstanceFunction, QtCore, qplugin.h)
     271QT_CLASS_LIB(QPluginLoader, QtCore, qpluginloader.h)
     272QT_CLASS_LIB(QUuid, QtCore, quuid.h)
     273QT_CLASS_LIB(QAtomicInt, QtCore, qatomic.h)
     274QT_CLASS_LIB(QAtomicPointer, QtCore, qatomic.h)
     275QT_CLASS_LIB(QBasicAtomicInt, QtCore, qbasicatomic.h)
     276QT_CLASS_LIB(QBasicAtomicPointer, QtCore, qbasicatomic.h)
     277QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
     278QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
     279QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
     280QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
     281QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
     282QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
     283QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
     284QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
     285QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
     286QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
     287QT_CLASS_LIB(QSemaphore, QtCore, qsemaphore.h)
     288QT_CLASS_LIB(QThread, QtCore, qthread.h)
     289QT_CLASS_LIB(QThread, QtCore, qthread.h)
     290QT_CLASS_LIB(QThreadStorageData, QtCore, qthreadstorage.h)
     291QT_CLASS_LIB(QThreadStorage, QtCore, qthreadstorage.h)
     292QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
     293QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
     294QT_CLASS_LIB(QAbstractState, QtCore, qabstractstate.h)
     295QT_CLASS_LIB(QAbstractTransition, QtCore, qabstracttransition.h)
     296QT_CLASS_LIB(QEventTransition, QtCore, qeventtransition.h)
     297QT_CLASS_LIB(QFinalState, QtCore, qfinalstate.h)
     298QT_CLASS_LIB(QHistoryState, QtCore, qhistorystate.h)
     299QT_CLASS_LIB(QSignalTransition, QtCore, qsignaltransition.h)
     300QT_CLASS_LIB(QState, QtCore, qstate.h)
     301QT_CLASS_LIB(QStateMachine, QtCore, qstatemachine.h)
     302QT_CLASS_LIB(QAbstractAnimation, QtCore, qabstractanimation.h)
     303QT_CLASS_LIB(QAnimationGroup, QtCore, qanimationgroup.h)
     304QT_CLASS_LIB(QParallelAnimationGroup, QtCore, qparallelanimationgroup.h)
     305QT_CLASS_LIB(QPauseAnimation, QtCore, qpauseanimation.h)
     306QT_CLASS_LIB(QPropertyAnimation, QtCore, qpropertyanimation.h)
     307QT_CLASS_LIB(QSequentialAnimationGroup, QtCore, qsequentialanimationgroup.h)
     308QT_CLASS_LIB(QVariantAnimation, QtCore, qvariantanimation.h)
    270309QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
    271310QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
    … …  
    278317QT_CLASS_LIB(QGLColormap, QtOpenGL, qglcolormap.h)
    279318QT_CLASS_LIB(QGLFramebufferObject, QtOpenGL, qglframebufferobject.h)
     319QT_CLASS_LIB(QGLFramebufferObjectFormat, QtOpenGL, qglframebufferobject.h)
    280320QT_CLASS_LIB(QGLPixelBuffer, QtOpenGL, qglpixelbuffer.h)
     321QT_CLASS_LIB(QGLScreenSurfaceFunctions, QtOpenGL, qglscreen_qws.h)
     322QT_CLASS_LIB(QGLScreen, QtOpenGL, qglscreen_qws.h)
     323QT_CLASS_LIB(QGLShader, QtOpenGL, qglshaderprogram.h)
     324QT_CLASS_LIB(QGLShaderProgram, QtOpenGL, qglshaderprogram.h)
     325QT_CLASS_LIB(QXmlNamespaceSupport, QtXml, qxml.h)
     326QT_CLASS_LIB(QXmlAttributes, QtXml, qxml.h)
     327QT_CLASS_LIB(QXmlInputSource, QtXml, qxml.h)
     328QT_CLASS_LIB(QXmlParseException, QtXml, qxml.h)
     329QT_CLASS_LIB(QXmlReader, QtXml, qxml.h)
     330QT_CLASS_LIB(QXmlSimpleReader, QtXml, qxml.h)
     331QT_CLASS_LIB(QXmlLocator, QtXml, qxml.h)
     332QT_CLASS_LIB(QXmlContentHandler, QtXml, qxml.h)
     333QT_CLASS_LIB(QXmlErrorHandler, QtXml, qxml.h)
     334QT_CLASS_LIB(QXmlDTDHandler, QtXml, qxml.h)
     335QT_CLASS_LIB(QXmlEntityResolver, QtXml, qxml.h)
     336QT_CLASS_LIB(QXmlLexicalHandler, QtXml, qxml.h)
     337QT_CLASS_LIB(QXmlDeclHandler, QtXml, qxml.h)
     338QT_CLASS_LIB(QXmlDefaultHandler, QtXml, qxml.h)
    281339QT_CLASS_LIB(QDomImplementation, QtXml, qdom.h)
    282340QT_CLASS_LIB(QDomNode, QtXml, qdom.h)
    … …  
    296354QT_CLASS_LIB(QDomEntityReference, QtXml, qdom.h)
    297355QT_CLASS_LIB(QDomProcessingInstruction, QtXml, qdom.h)
    298 QT_CLASS_LIB(QXmlNamespaceSupport, QtXml, qxml.h)
    299 QT_CLASS_LIB(QXmlAttributes, QtXml, qxml.h)
    300 QT_CLASS_LIB(QXmlInputSource, QtXml, qxml.h)
    301 QT_CLASS_LIB(QXmlParseException, QtXml, qxml.h)
    302 QT_CLASS_LIB(QXmlReader, QtXml, qxml.h)
    303 QT_CLASS_LIB(QXmlSimpleReader, QtXml, qxml.h)
    304 QT_CLASS_LIB(QXmlLocator, QtXml, qxml.h)
    305 QT_CLASS_LIB(QXmlContentHandler, QtXml, qxml.h)
    306 QT_CLASS_LIB(QXmlErrorHandler, QtXml, qxml.h)
    307 QT_CLASS_LIB(QXmlDTDHandler, QtXml, qxml.h)
    308 QT_CLASS_LIB(QXmlEntityResolver, QtXml, qxml.h)
    309 QT_CLASS_LIB(QXmlLexicalHandler, QtXml, qxml.h)
    310 QT_CLASS_LIB(QXmlDeclHandler, QtXml, qxml.h)
    311 QT_CLASS_LIB(QXmlDefaultHandler, QtXml, qxml.h)
    312356QT_CLASS_LIB(QXmlStreamAttribute, QtXml, qxmlstream.h)
    313357QT_CLASS_LIB(QXmlStreamAttributes, QtXml, qxmlstream.h)
    … …  
    331375QT_CLASS_LIB(QNetworkAccessManager, QtNetwork, qnetworkaccessmanager.h)
    332376QT_CLASS_LIB(QNetworkCookie, QtNetwork, qnetworkcookie.h)
    333 QT_CLASS_LIB(QNetworkCookieJar, QtNetwork, qnetworkcookie.h)
     377QT_CLASS_LIB(QNetworkCookieJar, QtNetwork, qnetworkcookiejar.h)
    334378QT_CLASS_LIB(QNetworkDiskCache, QtNetwork, qnetworkdiskcache.h)
    335379QT_CLASS_LIB(QNetworkReply, QtNetwork, qnetworkreply.h)
    … …  
    385429QT_CLASS_LIB(QXmlQuery, QtXmlPatterns, qxmlquery.h)
    386430QT_CLASS_LIB(QXmlResultItems, QtXmlPatterns, qxmlresultitems.h)
     431QT_CLASS_LIB(QXmlSchema, QtXmlPatterns, qxmlschema.h)
     432QT_CLASS_LIB(QXmlSchemaValidator, QtXmlPatterns, qxmlschemavalidator.h)
    387433QT_CLASS_LIB(QXmlSerializer, QtXmlPatterns, qxmlserializer.h)
    388434QT_CLASS_LIB(QAxBase, ActiveQt, qaxbase.h)
    … …  
    397443QT_CLASS_LIB(QAxFactory, ActiveQt, qaxfactory.h)
    398444QT_CLASS_LIB(QAxClass, ActiveQt, qaxfactory.h)
     445QT_CLASS_LIB(QGraphicsWebView, QtWebKit, qgraphicswebview.h)
    399446QT_CLASS_LIB(QWebDatabase, QtWebKit, qwebdatabase.h)
     447QT_CLASS_LIB(QWebElement, QtWebKit, qwebelement.h)
     448QT_CLASS_LIB(QWebElementCollection, QtWebKit, qwebelement.h)
    400449QT_CLASS_LIB(QWebHitTestResult, QtWebKit, qwebframe.h)
    401450QT_CLASS_LIB(QWebFrame, QtWebKit, qwebframe.h)
    … …  
    403452QT_CLASS_LIB(QWebHistory, QtWebKit, qwebhistory.h)
    404453QT_CLASS_LIB(QWebHistoryInterface, QtWebKit, qwebhistoryinterface.h)
     454QT_CLASS_LIB(QWebInspector, QtWebKit, qwebinspector.h)
    405455QT_CLASS_LIB(QWebPage, QtWebKit, qwebpage.h)
    406456QT_CLASS_LIB(QWebPluginFactory, QtWebKit, qwebpluginfactory.h)
    … …  
    408458QT_CLASS_LIB(QWebSettings, QtWebKit, qwebsettings.h)
    409459QT_CLASS_LIB(QWebView, QtWebKit, qwebview.h)
     460QT_CLASS_LIB(QAudioDeviceInfo, QtMultimedia, qaudiodeviceinfo.h)
     461QT_CLASS_LIB(QAbstractAudioDeviceInfo, QtMultimedia, qaudioengine.h)
     462QT_CLASS_LIB(QAbstractAudioOutput, QtMultimedia, qaudioengine.h)
     463QT_CLASS_LIB(QAbstractAudioInput, QtMultimedia, qaudioengine.h)
     464QT_CLASS_LIB(QAudioEngineFactoryInterface, QtMultimedia, qaudioengineplugin.h)
     465QT_CLASS_LIB(QAudioEnginePlugin, QtMultimedia, qaudioengineplugin.h)
     466QT_CLASS_LIB(QAudioFormat, QtMultimedia, qaudioformat.h)
     467QT_CLASS_LIB(QAudioInput, QtMultimedia, qaudioinput.h)
     468QT_CLASS_LIB(QAudioOutput, QtMultimedia, qaudiooutput.h)
     469QT_CLASS_LIB(QAbstractVideoBuffer, QtMultimedia, qabstractvideobuffer.h)
     470QT_CLASS_LIB(QAbstractVideoSurface, QtMultimedia, qabstractvideosurface.h)
     471QT_CLASS_LIB(QVideoFrame, QtMultimedia, qvideoframe.h)
     472QT_CLASS_LIB(QVideoSurfaceFormat, QtMultimedia, qvideosurfaceformat.h)
    410473QT_CLASS_LIB(QSignalSpy, QtTest, qsignalspy.h)
    411474QT_CLASS_LIB(QTest, QtTest, qtest.h)
     475QT_CLASS_LIB(QtTestGui, QtTest, qtest_gui.h)
    412476QT_CLASS_LIB(QTestAccessibilityEvent, QtTest, qtestaccessible.h)
    413477QT_CLASS_LIB(QTestAccessibility, QtTest, qtestaccessible.h)
     478QT_CLASS_LIB(QTestBasicStreamer, QtTest, qtestbasicstreamer.h)
     479QT_CLASS_LIB(QTestCoreElement, QtTest, qtestcoreelement.h)
     480QT_CLASS_LIB(QTestCoreList, QtTest, qtestcorelist.h)
    414481QT_CLASS_LIB(QTestData, QtTest, qtestdata.h)
     482QT_CLASS_LIB(QTestElement, QtTest, qtestelement.h)
     483QT_CLASS_LIB(QTestElementAttribute, QtTest, qtestelementattribute.h)
    415484QT_CLASS_LIB(QTestEvent, QtTest, qtestevent.h)
    416485QT_CLASS_LIB(QTestKeyEvent, QtTest, qtestevent.h)
    … …  
    420489QT_CLASS_LIB(QTestEventList, QtTest, qtestevent.h)
    421490QT_CLASS_LIB(QTestEventLoop, QtTest, qtesteventloop.h)
     491QT_CLASS_LIB(QTestFileLogger, QtTest, qtestfilelogger.h)
     492QT_CLASS_LIB(QTestLightXmlStreamer, QtTest, qtestlightxmlstreamer.h)
    422493QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h)
    423494QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h)
    424495QT_CLASS_LIB(QSpontaneKeyEvent, QtTest, qtestspontaneevent.h)
     496QT_CLASS_LIB(QTestXmlStreamer, QtTest, qtestxmlstreamer.h)
     497QT_CLASS_LIB(QTestXunitStreamer, QtTest, qtestxunitstreamer.h)
    425498QT_CLASS_LIB(QDBusAbstractAdaptor, QtDBus, qdbusabstractadaptor.h)
     499QT_CLASS_LIB(QDBusAbstractInterfaceBase, QtDBus, qdbusabstractinterface.h)
    426500QT_CLASS_LIB(QDBusAbstractInterface, QtDBus, qdbusabstractinterface.h)
    427501QT_CLASS_LIB(QDBusArgument, QtDBus, qdbusargument.h)
    … …  
    443517QT_CLASS_LIB(QDBusReply, QtDBus, qdbusreply.h)
    444518QT_CLASS_LIB(QDBusServer, QtDBus, qdbusserver.h)
     519QT_CLASS_LIB(QDBusServiceWatcher, QtDBus, qdbusservicewatcher.h)
    445520QT_CLASS_LIB(QScriptable, QtScript, qscriptable.h)
    446521QT_CLASS_LIB(QScriptClass, QtScript, qscriptclass.h)
    … …  
    454529QT_CLASS_LIB(QScriptExtensionInterface, QtScript, qscriptextensioninterface.h)
    455530QT_CLASS_LIB(QScriptExtensionPlugin, QtScript, qscriptextensionplugin.h)
     531QT_CLASS_LIB(QScriptProgram, QtScript, qscriptprogram.h)
    456532QT_CLASS_LIB(QScriptString, QtScript, qscriptstring.h)
    457533QT_CLASS_LIB(QScriptValueList, QtScript, qscriptvalue.h)
    … …  
    475551QT_CLASS_LIB(QSqlRelationalTableModel, QtSql, qsqlrelationaltablemodel.h)
    476552QT_CLASS_LIB(QSqlTableModel, QtSql, qsqltablemodel.h)
     553QT_CLASS_LIB(QSQLite2Result, QtSql, qsql_sqlite2.h)
     554QT_CLASS_LIB(QSQLite2Driver, QtSql, qsql_sqlite2.h)
     555QT_CLASS_LIB(QODBCResult, QtSql, qsql_odbc.h)
     556QT_CLASS_LIB(QODBCDriver, QtSql, qsql_odbc.h)
     557QT_CLASS_LIB(QTDSResult, QtSql, qsql_tds.h)
     558QT_CLASS_LIB(QTDSDriver, QtSql, qsql_tds.h)
     559QT_CLASS_LIB(QIBaseResult, QtSql, qsql_ibase.h)
     560QT_CLASS_LIB(QIBaseDriver, QtSql, qsql_ibase.h)
     561QT_CLASS_LIB(QSQLiteResult, QtSql, qsql_sqlite.h)
     562QT_CLASS_LIB(QSQLiteDriver, QtSql, qsql_sqlite.h)
     563QT_CLASS_LIB(QMYSQLResult, QtSql, qsql_mysql.h)
     564QT_CLASS_LIB(QMYSQLDriver, QtSql, qsql_mysql.h)
     565QT_CLASS_LIB(QPSQLResult, QtSql, qsql_psql.h)
     566QT_CLASS_LIB(QPSQLDriver, QtSql, qsql_psql.h)
     567QT_CLASS_LIB(QOCIResult, QtSql, qsql_oci.h)
     568QT_CLASS_LIB(QOCIDriver, QtSql, qsql_oci.h)
    477569QT_CLASS_LIB(QDB2Result, QtSql, qsql_db2.h)
    478570QT_CLASS_LIB(QDB2Driver, QtSql, qsql_db2.h)
    479 QT_CLASS_LIB(QIBaseResult, QtSql, qsql_ibase.h)
    480 QT_CLASS_LIB(QIBaseDriver, QtSql, qsql_ibase.h)
    481 QT_CLASS_LIB(QMYSQLResult, QtSql, qsql_mysql.h)
    482 QT_CLASS_LIB(QMYSQLDriver, QtSql, qsql_mysql.h)
    483 QT_CLASS_LIB(QOCIResult, QtSql, qsql_oci.h)
    484 QT_CLASS_LIB(QOCIDriver, QtSql, qsql_oci.h)
    485 QT_CLASS_LIB(QODBCResult, QtSql, qsql_odbc.h)
    486 QT_CLASS_LIB(QODBCDriver, QtSql, qsql_odbc.h)
    487 QT_CLASS_LIB(QPSQLResult, QtSql, qsql_psql.h)
    488 QT_CLASS_LIB(QPSQLDriver, QtSql, qsql_psql.h)
    489 QT_CLASS_LIB(QSQLiteResult, QtSql, qsql_sqlite.h)
    490 QT_CLASS_LIB(QSQLiteDriver, QtSql, qsql_sqlite.h)
    491 QT_CLASS_LIB(QSQLite2Result, QtSql, qsql_sqlite2.h)
    492 QT_CLASS_LIB(QSQLite2Driver, QtSql, qsql_sqlite2.h)
    493 QT_CLASS_LIB(QTDSResult, QtSql, qsql_tds.h)
    494 QT_CLASS_LIB(QTDSDriver, QtSql, qsql_tds.h)
    495 QT_CLASS_LIB(QAccessible, QtGui, qaccessible.h)
    496 QT_CLASS_LIB(QAccessibleInterface, QtGui, qaccessible.h)
    497 QT_CLASS_LIB(QAccessibleInterfaceEx, QtGui, qaccessible.h)
    498 QT_CLASS_LIB(QAccessibleEvent, QtGui, qaccessible.h)
    499 QT_CLASS_LIB(QAccessible2Interface, QtGui, qaccessible2.h)
    500 QT_CLASS_LIB(QAccessibleTextInterface, QtGui, qaccessible2.h)
    501 QT_CLASS_LIB(QAccessibleEditableTextInterface, QtGui, qaccessible2.h)
    502 QT_CLASS_LIB(QAccessibleSimpleEditableTextInterface, QtGui, qaccessible2.h)
    503 QT_CLASS_LIB(QAccessibleValueInterface, QtGui, qaccessible2.h)
    504 QT_CLASS_LIB(QAccessibleTableInterface, QtGui, qaccessible2.h)
    505 QT_CLASS_LIB(QAccessibleBridge, QtGui, qaccessiblebridge.h)
    506 QT_CLASS_LIB(QAccessibleBridgeFactoryInterface, QtGui, qaccessiblebridge.h)
    507 QT_CLASS_LIB(QAccessibleBridgePlugin, QtGui, qaccessiblebridge.h)
    508 QT_CLASS_LIB(QAccessibleObject, QtGui, qaccessibleobject.h)
    509 QT_CLASS_LIB(QAccessibleObjectEx, QtGui, qaccessibleobject.h)
    510 QT_CLASS_LIB(QAccessibleApplication, QtGui, qaccessibleobject.h)
    511 QT_CLASS_LIB(QAccessibleFactoryInterface, QtGui, qaccessibleplugin.h)
    512 QT_CLASS_LIB(QAccessiblePlugin, QtGui, qaccessibleplugin.h)
    513 QT_CLASS_LIB(QAccessibleWidget, QtGui, qaccessiblewidget.h)
    514 QT_CLASS_LIB(QAccessibleWidgetEx, QtGui, qaccessiblewidget.h)
    515 QT_CLASS_LIB(QAbstractPageSetupDialog, QtGui, qabstractpagesetupdialog.h)
    516 QT_CLASS_LIB(QAbstractPrintDialog, QtGui, qabstractprintdialog.h)
    517 QT_CLASS_LIB(QColorDialog, QtGui, qcolordialog.h)
    518 QT_CLASS_LIB(QDialog, QtGui, qdialog.h)
    519 QT_CLASS_LIB(QErrorMessage, QtGui, qerrormessage.h)
    520 QT_CLASS_LIB(QFileDialog, QtGui, qfiledialog.h)
    521 QT_CLASS_LIB(QFileSystemModel, QtGui, qfilesystemmodel.h)
    522 QT_CLASS_LIB(QFontDialog, QtGui, qfontdialog.h)
    523 QT_CLASS_LIB(QInputDialog, QtGui, qinputdialog.h)
    524 QT_CLASS_LIB(QMessageBox, QtGui, qmessagebox.h)
    525 QT_CLASS_LIB(QPageSetupDialog, QtGui, qpagesetupdialog.h)
    526 QT_CLASS_LIB(QUnixPrintWidget, QtGui, qprintdialog.h)
    527 QT_CLASS_LIB(QPrintDialog, QtGui, qprintdialog.h)
    528 QT_CLASS_LIB(QPrintPreviewDialog, QtGui, qprintpreviewdialog.h)
    529 QT_CLASS_LIB(QProgressDialog, QtGui, qprogressdialog.h)
    530 QT_CLASS_LIB(QWizard, QtGui, qwizard.h)
    531 QT_CLASS_LIB(QWizardPage, QtGui, qwizard.h)
    532 QT_CLASS_LIB(QGraphicsGridLayout, QtGui, qgraphicsgridlayout.h)
    533 QT_CLASS_LIB(QGraphicsItem, QtGui, qgraphicsitem.h)
    534 QT_CLASS_LIB(QAbstractGraphicsShapeItem, QtGui, qgraphicsitem.h)
    535 QT_CLASS_LIB(QGraphicsPathItem, QtGui, qgraphicsitem.h)
    536 QT_CLASS_LIB(QGraphicsRectItem, QtGui, qgraphicsitem.h)
    537 QT_CLASS_LIB(QGraphicsEllipseItem, QtGui, qgraphicsitem.h)
    538 QT_CLASS_LIB(QGraphicsPolygonItem, QtGui, qgraphicsitem.h)
    539 QT_CLASS_LIB(QGraphicsLineItem, QtGui, qgraphicsitem.h)
    540 QT_CLASS_LIB(QGraphicsPixmapItem, QtGui, qgraphicsitem.h)
    541 QT_CLASS_LIB(QGraphicsTextItem, QtGui, qgraphicsitem.h)
    542 QT_CLASS_LIB(QGraphicsSimpleTextItem, QtGui, qgraphicsitem.h)
    543 QT_CLASS_LIB(QGraphicsItemGroup, QtGui, qgraphicsitem.h)
    544 QT_CLASS_LIB(QGraphicsItemAnimation, QtGui, qgraphicsitemanimation.h)
    545 QT_CLASS_LIB(QGraphicsLayout, QtGui, qgraphicslayout.h)
    546 QT_CLASS_LIB(QGraphicsLayoutItem, QtGui, qgraphicslayoutitem.h)
    547 QT_CLASS_LIB(QGraphicsLinearLayout, QtGui, qgraphicslinearlayout.h)
    548 QT_CLASS_LIB(QGraphicsProxyWidget, QtGui, qgraphicsproxywidget.h)
    549 QT_CLASS_LIB(QGraphicsScene, QtGui, qgraphicsscene.h)
    550 QT_CLASS_LIB(QGraphicsSceneEvent, QtGui, qgraphicssceneevent.h)
    551 QT_CLASS_LIB(QGraphicsSceneMouseEvent, QtGui, qgraphicssceneevent.h)
    552 QT_CLASS_LIB(QGraphicsSceneWheelEvent, QtGui, qgraphicssceneevent.h)
    553 QT_CLASS_LIB(QGraphicsSceneContextMenuEvent, QtGui, qgraphicssceneevent.h)
    554 QT_CLASS_LIB(QGraphicsSceneHoverEvent, QtGui, qgraphicssceneevent.h)
    555 QT_CLASS_LIB(QGraphicsSceneHelpEvent, QtGui, qgraphicssceneevent.h)
    556 QT_CLASS_LIB(QGraphicsSceneDragDropEvent, QtGui, qgraphicssceneevent.h)
    557 QT_CLASS_LIB(QGraphicsSceneResizeEvent, QtGui, qgraphicssceneevent.h)
    558 QT_CLASS_LIB(QGraphicsSceneMoveEvent, QtGui, qgraphicssceneevent.h)
    559 QT_CLASS_LIB(QGraphicsView, QtGui, qgraphicsview.h)
    560 QT_CLASS_LIB(QGraphicsWidget, QtGui, qgraphicswidget.h)
    561571QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h)
    562572QT_CLASS_LIB(QIcon, QtGui, qicon.h)
    … …  
    582592QT_CLASS_LIB(QPixmap, QtGui, qpixmap.h)
    583593QT_CLASS_LIB(QPixmapCache, QtGui, qpixmapcache.h)
    584 QT_CLASS_LIB(QInputContext, QtGui, qinputcontext.h)
    585 QT_CLASS_LIB(QInputContextFactory, QtGui, qinputcontextfactory.h)
    586 QT_CLASS_LIB(QInputContextFactoryInterface, QtGui, qinputcontextplugin.h)
    587 QT_CLASS_LIB(QInputContextPlugin, QtGui, qinputcontextplugin.h)
    588 QT_CLASS_LIB(QAbstractItemDelegate, QtGui, qabstractitemdelegate.h)
    589 QT_CLASS_LIB(QAbstractItemView, QtGui, qabstractitemview.h)
    590 QT_CLASS_LIB(QAbstractProxyModel, QtGui, qabstractproxymodel.h)
    591 QT_CLASS_LIB(QColumnView, QtGui, qcolumnview.h)
    592 QT_CLASS_LIB(QDataWidgetMapper, QtGui, qdatawidgetmapper.h)
    593 QT_CLASS_LIB(QDirModel, QtGui, qdirmodel.h)
    594 QT_CLASS_LIB(QFileIconProvider, QtGui, qfileiconprovider.h)
    595 QT_CLASS_LIB(QHeaderView, QtGui, qheaderview.h)
    596 QT_CLASS_LIB(QItemDelegate, QtGui, qitemdelegate.h)
    597 QT_CLASS_LIB(QItemEditorCreatorBase, QtGui, qitemeditorfactory.h)
    598 QT_CLASS_LIB(QItemEditorCreator, QtGui, qitemeditorfactory.h)
    599 QT_CLASS_LIB(QStandardItemEditorCreator, QtGui, qitemeditorfactory.h)
    600 QT_CLASS_LIB(QItemEditorFactory, QtGui, qitemeditorfactory.h)
    601 QT_CLASS_LIB(QItemSelectionRange, QtGui, qitemselectionmodel.h)
    602 QT_CLASS_LIB(QItemSelectionModel, QtGui, qitemselectionmodel.h)
    603 QT_CLASS_LIB(QItemSelection, QtGui, qitemselectionmodel.h)
    604 QT_CLASS_LIB(QListView, QtGui, qlistview.h)
    605 QT_CLASS_LIB(QListWidgetItem, QtGui, qlistwidget.h)
    606 QT_CLASS_LIB(QListWidget, QtGui, qlistwidget.h)
    607 QT_CLASS_LIB(QProxyModel, QtGui, qproxymodel.h)
    608 QT_CLASS_LIB(QSortFilterProxyModel, QtGui, qsortfilterproxymodel.h)
    609 QT_CLASS_LIB(QStandardItem, QtGui, qstandarditemmodel.h)
    610 QT_CLASS_LIB(QStandardItemModel, QtGui, qstandarditemmodel.h)
    611 QT_CLASS_LIB(QStringListModel, QtGui, qstringlistmodel.h)
    612 QT_CLASS_LIB(QStyledItemDelegate, QtGui, qstyleditemdelegate.h)
    613 QT_CLASS_LIB(QTableView, QtGui, qtableview.h)
    614 QT_CLASS_LIB(QTableWidgetSelectionRange, QtGui, qtablewidget.h)
    615 QT_CLASS_LIB(QTableWidgetItem, QtGui, qtablewidget.h)
    616 QT_CLASS_LIB(QTableWidget, QtGui, qtablewidget.h)
    617 QT_CLASS_LIB(QTreeView, QtGui, qtreeview.h)
    618 QT_CLASS_LIB(QTreeWidgetItem, QtGui, qtreewidget.h)
    619 QT_CLASS_LIB(QTreeWidget, QtGui, qtreewidget.h)
    620 QT_CLASS_LIB(QTreeWidgetItemIterator, QtGui, qtreewidgetitemiterator.h)
    621 QT_CLASS_LIB(QAction, QtGui, qaction.h)
    622 QT_CLASS_LIB(QActionGroup, QtGui, qactiongroup.h)
    623 QT_CLASS_LIB(QApplication, QtGui, qapplication.h)
    624 QT_CLASS_LIB(QBoxLayout, QtGui, qboxlayout.h)
    625 QT_CLASS_LIB(QHBoxLayout, QtGui, qboxlayout.h)
    626 QT_CLASS_LIB(QVBoxLayout, QtGui, qboxlayout.h)
    627 QT_CLASS_LIB(QClipboard, QtGui, qclipboard.h)
    628 QT_CLASS_LIB(QCursor, QtGui, qcursor.h)
    629 QT_CLASS_LIB(QCursor, QtGui, qcursor.h)
    630 QT_CLASS_LIB(QCursorShape, QtGui, qcursor.h)
    631 QT_CLASS_LIB(QDesktopWidget, QtGui, qdesktopwidget.h)
    632 QT_CLASS_LIB(QDrag, QtGui, qdrag.h)
    633 QT_CLASS_LIB(QtEvents, QtGui, qevent.h)
    634 QT_CLASS_LIB(QInputEvent, QtGui, qevent.h)
    635 QT_CLASS_LIB(QMouseEvent, QtGui, qevent.h)
    636 QT_CLASS_LIB(QHoverEvent, QtGui, qevent.h)
    637 QT_CLASS_LIB(QWheelEvent, QtGui, qevent.h)
    638 QT_CLASS_LIB(QTabletEvent, QtGui, qevent.h)
    639 QT_CLASS_LIB(QKeyEvent, QtGui, qevent.h)
    640 QT_CLASS_LIB(QFocusEvent, QtGui, qevent.h)
    641 QT_CLASS_LIB(QPaintEvent, QtGui, qevent.h)
    642 QT_CLASS_LIB(QUpdateLaterEvent, QtGui, qevent.h)
    643 QT_CLASS_LIB(QMoveEvent, QtGui, qevent.h)
    644 QT_CLASS_LIB(QResizeEvent, QtGui, qevent.h)
    645 QT_CLASS_LIB(QCloseEvent, QtGui, qevent.h)
    646 QT_CLASS_LIB(QIconDragEvent, QtGui, qevent.h)
    647 QT_CLASS_LIB(QShowEvent, QtGui, qevent.h)
    648 QT_CLASS_LIB(QHideEvent, QtGui, qevent.h)
    649 QT_CLASS_LIB(QContextMenuEvent, QtGui, qevent.h)
    650 QT_CLASS_LIB(QInputMethodEvent, QtGui, qevent.h)
    651 QT_CLASS_LIB(QDropEvent, QtGui, qevent.h)
    652 QT_CLASS_LIB(QDragMoveEvent, QtGui, qevent.h)
    653 QT_CLASS_LIB(QDragEnterEvent, QtGui, qevent.h)
    654 QT_CLASS_LIB(QDragResponseEvent, QtGui, qevent.h)
    655 QT_CLASS_LIB(QDragLeaveEvent, QtGui, qevent.h)
    656 QT_CLASS_LIB(QHelpEvent, QtGui, qevent.h)
    657 QT_CLASS_LIB(QStatusTipEvent, QtGui, qevent.h)
    658 QT_CLASS_LIB(QWhatsThisClickedEvent, QtGui, qevent.h)
    659 QT_CLASS_LIB(QActionEvent, QtGui, qevent.h)
    660 QT_CLASS_LIB(QFileOpenEvent, QtGui, qevent.h)
    661 QT_CLASS_LIB(QToolBarChangeEvent, QtGui, qevent.h)
    662 QT_CLASS_LIB(QShortcutEvent, QtGui, qevent.h)
    663 QT_CLASS_LIB(QClipboardEvent, QtGui, qevent.h)
    664 QT_CLASS_LIB(QWindowStateChangeEvent, QtGui, qevent.h)
    665 QT_CLASS_LIB(QMenubarUpdatedEvent, QtGui, qevent.h)
    666 QT_CLASS_LIB(QFormLayout, QtGui, qformlayout.h)
    667 QT_CLASS_LIB(QGridLayout, QtGui, qgridlayout.h)
    668 QT_CLASS_LIB(QKeySequence, QtGui, qkeysequence.h)
    669 QT_CLASS_LIB(QKeySequence, QtGui, qkeysequence.h)
    670 QT_CLASS_LIB(QLayoutIterator, QtGui, qlayout.h)
    671 QT_CLASS_LIB(QLayout, QtGui, qlayout.h)
    672 QT_CLASS_LIB(QLayoutItem, QtGui, qlayoutitem.h)
    673 QT_CLASS_LIB(QSpacerItem, QtGui, qlayoutitem.h)
    674 QT_CLASS_LIB(QWidgetItem, QtGui, qlayoutitem.h)
    675 QT_CLASS_LIB(QWidgetItemV2, QtGui, qlayoutitem.h)
    676 QT_CLASS_LIB(QMimeSource, QtGui, qmime.h)
    677 QT_CLASS_LIB(QWindowsMime, QtGui, qmime.h)
    678 QT_CLASS_LIB(QMacMime, QtGui, qmime.h)
    679 QT_CLASS_LIB(QMacPasteboardMime, QtGui, qmime.h)
    680 QT_CLASS_LIB(QPalette, QtGui, qpalette.h)
    681 QT_CLASS_LIB(QColorGroup, QtGui, qpalette.h)
    682 QT_CLASS_LIB(QSessionManager, QtGui, qsessionmanager.h)
    683 QT_CLASS_LIB(QShortcut, QtGui, qshortcut.h)
    684 QT_CLASS_LIB(QSizePolicy, QtGui, qsizepolicy.h)
    685 QT_CLASS_LIB(QSound, QtGui, qsound.h)
    686 QT_CLASS_LIB(QStackedLayout, QtGui, qstackedlayout.h)
    687 QT_CLASS_LIB(QToolTip, QtGui, qtooltip.h)
    688 QT_CLASS_LIB(QWhatsThis, QtGui, qwhatsthis.h)
    689 QT_CLASS_LIB(QWidgetData, QtGui, qwidget.h)
    690 QT_CLASS_LIB(QWidget, QtGui, qwidget.h)
    691 QT_CLASS_LIB(QWidgetAction, QtGui, qwidgetaction.h)
    692 QT_CLASS_LIB(QWidgetList, QtGui, qwindowdefs.h)
    693 QT_CLASS_LIB(QWidgetMapper, QtGui, qwindowdefs.h)
    694 QT_CLASS_LIB(QWidgetSet, QtGui, qwindowdefs.h)
    695 QT_CLASS_LIB(QX11EmbedWidget, QtGui, qx11embed_x11.h)
    696 QT_CLASS_LIB(QX11EmbedContainer, QtGui, qx11embed_x11.h)
    697 QT_CLASS_LIB(QX11Info, QtGui, qx11info_x11.h)
    698 QT_CLASS_LIB(QBrush, QtGui, qbrush.h)
    699 QT_CLASS_LIB(QBrushData, QtGui, qbrush.h)
    700 QT_CLASS_LIB(QGradientStop, QtGui, qbrush.h)
    701 QT_CLASS_LIB(QGradientStops, QtGui, qbrush.h)
    702 QT_CLASS_LIB(QGradient, QtGui, qbrush.h)
    703 QT_CLASS_LIB(QLinearGradient, QtGui, qbrush.h)
    704 QT_CLASS_LIB(QRadialGradient, QtGui, qbrush.h)
    705 QT_CLASS_LIB(QConicalGradient, QtGui, qbrush.h)
    706 QT_CLASS_LIB(QColor, QtGui, qcolor.h)
    707 QT_CLASS_LIB(QColormap, QtGui, qcolormap.h)
    708 QT_CLASS_LIB(QMatrix, QtGui, qmatrix.h)
    709 QT_CLASS_LIB(QPaintDevice, QtGui, qpaintdevice.h)
    710 QT_CLASS_LIB(QTextItem, QtGui, qpaintengine.h)
    711 QT_CLASS_LIB(QPaintEngine, QtGui, qpaintengine.h)
    712 QT_CLASS_LIB(QPaintEngineState, QtGui, qpaintengine.h)
    713 QT_CLASS_LIB(QPainter, QtGui, qpainter.h)
    714 QT_CLASS_LIB(QPainterPath, QtGui, qpainterpath.h)
    715 QT_CLASS_LIB(QPainterPathPrivate, QtGui, qpainterpath.h)
    716 QT_CLASS_LIB(QPainterPathStroker, QtGui, qpainterpath.h)
    717 QT_CLASS_LIB(QPen, QtGui, qpen.h)
    718 QT_CLASS_LIB(QPolygon, QtGui, qpolygon.h)
    719 QT_CLASS_LIB(QPolygonF, QtGui, qpolygon.h)
    720 QT_CLASS_LIB(QPrintEngine, QtGui, qprintengine.h)
    721 QT_CLASS_LIB(QPrinter, QtGui, qprinter.h)
    722 QT_CLASS_LIB(QPrinterInfo, QtGui, qprinterinfo.h)
    723 QT_CLASS_LIB(QRegion, QtGui, qregion.h)
    724 QT_CLASS_LIB(QRgb, QtGui, qrgb.h)
    725 QT_CLASS_LIB(QStylePainter, QtGui, qstylepainter.h)
    726 QT_CLASS_LIB(QTransform, QtGui, qtransform.h)
    727 QT_CLASS_LIB(QWMatrix, QtGui, qwmatrix.h)
    728 QT_CLASS_LIB(QCDEStyle, QtGui, qcdestyle.h)
    729 QT_CLASS_LIB(QCleanlooksStyle, QtGui, qcleanlooksstyle.h)
    730 QT_CLASS_LIB(QCommonStyle, QtGui, qcommonstyle.h)
    731 QT_CLASS_LIB(QGtkStyle, QtGui, qgtkstyle.h)
    732 QT_CLASS_LIB(QMacStyle, QtGui, qmacstyle_mac.h)
    733 QT_CLASS_LIB(QMotifStyle, QtGui, qmotifstyle.h)
    734 QT_CLASS_LIB(QPlastiqueStyle, QtGui, qplastiquestyle.h)
    735 QT_CLASS_LIB(QStyle, QtGui, qstyle.h)
    736 QT_CLASS_LIB(QStyleFactory, QtGui, qstylefactory.h)
    737 QT_CLASS_LIB(QStyleOption, QtGui, qstyleoption.h)
    738 QT_CLASS_LIB(QStyleOptionFocusRect, QtGui, qstyleoption.h)
    739 QT_CLASS_LIB(QStyleOptionFrame, QtGui, qstyleoption.h)
    740 QT_CLASS_LIB(QStyleOptionFrameV2, QtGui, qstyleoption.h)
    741 QT_CLASS_LIB(QStyleOptionFrameV3, QtGui, qstyleoption.h)
    742 QT_CLASS_LIB(QStyleOptionTabWidgetFrame, QtGui, qstyleoption.h)
    743 QT_CLASS_LIB(QStyleOptionTabBarBase, QtGui, qstyleoption.h)
    744 QT_CLASS_LIB(QStyleOptionTabBarBaseV2, QtGui, qstyleoption.h)
    745 QT_CLASS_LIB(QStyleOptionHeader, QtGui, qstyleoption.h)
    746 QT_CLASS_LIB(QStyleOptionButton, QtGui, qstyleoption.h)
    747 QT_CLASS_LIB(QStyleOptionTab, QtGui, qstyleoption.h)
    748 QT_CLASS_LIB(QStyleOptionTabV2, QtGui, qstyleoption.h)
    749 QT_CLASS_LIB(QStyleOptionTabV3, QtGui, qstyleoption.h)
    750 QT_CLASS_LIB(QStyleOptionToolBar, QtGui, qstyleoption.h)
    751 QT_CLASS_LIB(QStyleOptionProgressBar, QtGui, qstyleoption.h)
    752 QT_CLASS_LIB(QStyleOptionProgressBarV2, QtGui, qstyleoption.h)
    753 QT_CLASS_LIB(QStyleOptionMenuItem, QtGui, qstyleoption.h)
    754 QT_CLASS_LIB(QStyleOptionQ3ListViewItem, QtGui, qstyleoption.h)
    755 QT_CLASS_LIB(QStyleOptionQ3DockWindow, QtGui, qstyleoption.h)
    756 QT_CLASS_LIB(QStyleOptionDockWidget, QtGui, qstyleoption.h)
    757 QT_CLASS_LIB(QStyleOptionDockWidgetV2, QtGui, qstyleoption.h)
    758 QT_CLASS_LIB(QStyleOptionViewItem, QtGui, qstyleoption.h)
    759 QT_CLASS_LIB(QStyleOptionViewItemV2, QtGui, qstyleoption.h)
    760 QT_CLASS_LIB(QStyleOptionViewItemV3, QtGui, qstyleoption.h)
    761 QT_CLASS_LIB(QStyleOptionViewItemV4, QtGui, qstyleoption.h)
    762 QT_CLASS_LIB(QStyleOptionToolBox, QtGui, qstyleoption.h)
    763 QT_CLASS_LIB(QStyleOptionToolBoxV2, QtGui, qstyleoption.h)
    764 QT_CLASS_LIB(QStyleOptionRubberBand, QtGui, qstyleoption.h)
    765 QT_CLASS_LIB(QStyleOptionComplex, QtGui, qstyleoption.h)
    766 QT_CLASS_LIB(QStyleOptionSlider, QtGui, qstyleoption.h)
    767 QT_CLASS_LIB(QStyleOptionSpinBox, QtGui, qstyleoption.h)
    768 QT_CLASS_LIB(QStyleOptionQ3ListView, QtGui, qstyleoption.h)
    769 QT_CLASS_LIB(QStyleOptionToolButton, QtGui, qstyleoption.h)
    770 QT_CLASS_LIB(QStyleOptionComboBox, QtGui, qstyleoption.h)
    771 QT_CLASS_LIB(QStyleOptionTitleBar, QtGui, qstyleoption.h)
    772 QT_CLASS_LIB(QStyleOptionGroupBox, QtGui, qstyleoption.h)
    773 QT_CLASS_LIB(QStyleOptionSizeGrip, QtGui, qstyleoption.h)
    774 QT_CLASS_LIB(QStyleOptionGraphicsItem, QtGui, qstyleoption.h)
    775 QT_CLASS_LIB(QStyleHintReturn, QtGui, qstyleoption.h)
    776 QT_CLASS_LIB(QStyleHintReturnMask, QtGui, qstyleoption.h)
    777 QT_CLASS_LIB(QStyleHintReturnVariant, QtGui, qstyleoption.h)
    778 QT_CLASS_LIB(QStyleFactoryInterface, QtGui, qstyleplugin.h)
    779 QT_CLASS_LIB(QStylePlugin, QtGui, qstyleplugin.h)
    780 QT_CLASS_LIB(QWindowsCEStyle, QtGui, qwindowscestyle.h)
    781 QT_CLASS_LIB(QWindowsMobileStyle, QtGui, qwindowsmobilestyle.h)
    782 QT_CLASS_LIB(QWindowsStyle, QtGui, qwindowsstyle.h)
    783 QT_CLASS_LIB(QWindowsVistaStyle, QtGui, qwindowsvistastyle.h)
    784 QT_CLASS_LIB(QWindowsXPStyle, QtGui, qwindowsxpstyle.h)
    785 QT_CLASS_LIB(QAbstractTextDocumentLayout, QtGui, qabstracttextdocumentlayout.h)
    786 QT_CLASS_LIB(QTextObjectInterface, QtGui, qabstracttextdocumentlayout.h)
    787 QT_CLASS_LIB(QFont, QtGui, qfont.h)
    788 QT_CLASS_LIB(QFontDatabase, QtGui, qfontdatabase.h)
    789 QT_CLASS_LIB(QFontInfo, QtGui, qfontinfo.h)
    790 QT_CLASS_LIB(QFontMetrics, QtGui, qfontmetrics.h)
    791 QT_CLASS_LIB(QFontMetricsF, QtGui, qfontmetrics.h)
    792 QT_CLASS_LIB(QSyntaxHighlighter, QtGui, qsyntaxhighlighter.h)
    793 QT_CLASS_LIB(QTextCursor, QtGui, qtextcursor.h)
    794 QT_CLASS_LIB(QAbstractUndoItem, QtGui, qtextdocument.h)
    795 QT_CLASS_LIB(QTextDocument, QtGui, qtextdocument.h)
    796 QT_CLASS_LIB(QTextDocumentFragment, QtGui, qtextdocumentfragment.h)
    797 QT_CLASS_LIB(QTextDocumentWriter, QtGui, qtextdocumentwriter.h)
    798 QT_CLASS_LIB(QTextLength, QtGui, qtextformat.h)
    799 QT_CLASS_LIB(QTextFormat, QtGui, qtextformat.h)
    800 QT_CLASS_LIB(QTextCharFormat, QtGui, qtextformat.h)
    801 QT_CLASS_LIB(QTextBlockFormat, QtGui, qtextformat.h)
    802 QT_CLASS_LIB(QTextListFormat, QtGui, qtextformat.h)
    803 QT_CLASS_LIB(QTextImageFormat, QtGui, qtextformat.h)
    804 QT_CLASS_LIB(QTextFrameFormat, QtGui, qtextformat.h)
    805 QT_CLASS_LIB(QTextTableFormat, QtGui, qtextformat.h)
    806 QT_CLASS_LIB(QTextTableCellFormat, QtGui, qtextformat.h)
    807 QT_CLASS_LIB(QTextInlineObject, QtGui, qtextlayout.h)
    808 QT_CLASS_LIB(QTextLayout, QtGui, qtextlayout.h)
    809 QT_CLASS_LIB(QTextLine, QtGui, qtextlayout.h)
    810 QT_CLASS_LIB(QTextList, QtGui, qtextlist.h)
    811 QT_CLASS_LIB(QTextObject, QtGui, qtextobject.h)
    812 QT_CLASS_LIB(QTextBlockGroup, QtGui, qtextobject.h)
    813 QT_CLASS_LIB(QTextFrameLayoutData, QtGui, qtextobject.h)
    814 QT_CLASS_LIB(QTextFrame, QtGui, qtextobject.h)
    815 QT_CLASS_LIB(QTextBlockUserData, QtGui, qtextobject.h)
    816 QT_CLASS_LIB(QTextBlock, QtGui, qtextobject.h)
    817 QT_CLASS_LIB(QTextFragment, QtGui, qtextobject.h)
    818 QT_CLASS_LIB(QTextOption, QtGui, qtextoption.h)
    819 QT_CLASS_LIB(QTextTableCell, QtGui, qtexttable.h)
    820 QT_CLASS_LIB(QTextTable, QtGui, qtexttable.h)
    821 QT_CLASS_LIB(QCompleter, QtGui, qcompleter.h)
    822 QT_CLASS_LIB(QDesktopServices, QtGui, qdesktopservices.h)
    823 QT_CLASS_LIB(QSystemTrayIcon, QtGui, qsystemtrayicon.h)
    824 QT_CLASS_LIB(QUndoGroup, QtGui, qundogroup.h)
    825 QT_CLASS_LIB(QUndoCommand, QtGui, qundostack.h)
    826 QT_CLASS_LIB(QUndoStack, QtGui, qundostack.h)
    827 QT_CLASS_LIB(QUndoView, QtGui, qundoview.h)
     594QT_CLASS_LIB(QS60MainApplication, QtGui, qs60mainapplication.h)
     595QT_CLASS_LIB(QS60MainAppUi, QtGui, qs60mainappui.h)
     596QT_CLASS_LIB(QS60MainDocument, QtGui, qs60maindocument.h)
     597QT_CLASS_LIB(QCopChannel, QtGui, qcopchannel_qws.h)
     598QT_CLASS_LIB(QDecorationAction, QtGui, qdecoration_qws.h)
     599QT_CLASS_LIB(QDecoration, QtGui, qdecoration_qws.h)
     600QT_CLASS_LIB(QDecorationDefault, QtGui, qdecorationdefault_qws.h)
     601QT_CLASS_LIB(QDecorationFactory, QtGui, qdecorationfactory_qws.h)
     602QT_CLASS_LIB(QDecorationFactoryInterface, QtGui, qdecorationplugin_qws.h)
     603QT_CLASS_LIB(QDecorationPlugin, QtGui, qdecorationplugin_qws.h)
     604QT_CLASS_LIB(QDecorationStyled, QtGui, qdecorationstyled_qws.h)
     605QT_CLASS_LIB(QDecorationWindows, QtGui, qdecorationwindows_qws.h)
     606QT_CLASS_LIB(QDirectPainter, QtGui, qdirectpainter_qws.h)
     607QT_CLASS_LIB(QWSKeyboardHandler, QtGui, qkbd_qws.h)
     608QT_CLASS_LIB(QKbdDriverFactory, QtGui, qkbddriverfactory_qws.h)
     609QT_CLASS_LIB(QWSKeyboardHandlerFactoryInterface, QtGui, qkbddriverplugin_qws.h)
     610QT_CLASS_LIB(QKbdDriverPlugin, QtGui, qkbddriverplugin_qws.h)
     611QT_CLASS_LIB(QWSLinuxInputKeyboardHandler, QtGui, qkbdlinuxinput_qws.h)
     612QT_CLASS_LIB(QWSQnxKeyboardHandler, QtGui, qkbdqnx_qws.h)
     613QT_CLASS_LIB(QWSTtyKeyboardHandler, QtGui, qkbdtty_qws.h)
     614QT_CLASS_LIB(QWSUmKeyboardHandler, QtGui, qkbdum_qws.h)
     615QT_CLASS_LIB(QVFbKeyboardHandler, QtGui, qkbdvfb_qws.h)
     616QT_CLASS_LIB(QWSPointerCalibrationData, QtGui, qmouse_qws.h)
     617QT_CLASS_LIB(QWSMouseHandler, QtGui, qmouse_qws.h)
     618QT_CLASS_LIB(QWSCalibratedMouseHandler, QtGui, qmouse_qws.h)
     619QT_CLASS_LIB(QMouseDriverFactory, QtGui, qmousedriverfactory_qws.h)
     620QT_CLASS_LIB(QWSMouseHandlerFactoryInterface, QtGui, qmousedriverplugin_qws.h)
     621QT_CLASS_LIB(QMouseDriverPlugin, QtGui, qmousedriverplugin_qws.h)
     622QT_CLASS_LIB(QWSLinuxInputMouseHandler, QtGui, qmouselinuxinput_qws.h)
     623QT_CLASS_LIB(QWSLinuxTPMouseHandler, QtGui, qmouselinuxtp_qws.h)
     624QT_CLASS_LIB(QWSPcMouseHandler, QtGui, qmousepc_qws.h)
     625QT_CLASS_LIB(QQnxMouseHandler, QtGui, qmouseqnx_qws.h)
     626QT_CLASS_LIB(QWSTslibMouseHandler, QtGui, qmousetslib_qws.h)
     627QT_CLASS_LIB(QVFbMouseHandler, QtGui, qmousevfb_qws.h)
     628QT_CLASS_LIB(QScreenCursor, QtGui, qscreen_qws.h)
     629QT_CLASS_LIB(QPoolEntry, QtGui, qscreen_qws.h)
     630QT_CLASS_LIB(QScreen, QtGui, qscreen_qws.h)
     631QT_CLASS_LIB(QScreenDriverFactory, QtGui, qscreendriverfactory_qws.h)
     632QT_CLASS_LIB(QScreenDriverFactoryInterface, QtGui, qscreendriverplugin_qws.h)
     633QT_CLASS_LIB(QScreenDriverPlugin, QtGui, qscreendriverplugin_qws.h)
     634QT_CLASS_LIB(QLinuxFb_Shared, QtGui, qscreenlinuxfb_qws.h)
     635QT_CLASS_LIB(QLinuxFbScreen, QtGui, qscreenlinuxfb_qws.h)
     636QT_CLASS_LIB(QProxyScreenCursor, QtGui, qscreenproxy_qws.h)
     637QT_CLASS_LIB(QProxyScreen, QtGui, qscreenproxy_qws.h)
     638QT_CLASS_LIB(QQnxScreen, QtGui, qscreenqnx_qws.h)
     639QT_CLASS_LIB(QTransformedScreen, QtGui, qscreentransformed_qws.h)
     640QT_CLASS_LIB(QVFbScreen, QtGui, qscreenvfb_qws.h)
     641QT_CLASS_LIB(QWSSoundServer, QtGui, qsoundqss_qws.h)
     642QT_CLASS_LIB(QWSSoundClient, QtGui, qsoundqss_qws.h)
     643QT_CLASS_LIB(QWSSoundServerSocket, QtGui, qsoundqss_qws.h)
     644QT_CLASS_LIB(QTransportAuth, QtGui, qtransportauth_qws.h)
     645QT_CLASS_LIB(QAuthDevice, QtGui, qtransportauth_qws.h)
     646QT_CLASS_LIB(QVFbHeader, QtGui, qvfbhdr.h)
     647QT_CLASS_LIB(QVFbKeyData, QtGui, qvfbhdr.h)
     648QT_CLASS_LIB(QWSInternalWindowInfo, QtGui, qwindowsystem_qws.h)
     649QT_CLASS_LIB(QWSScreenSaver, QtGui, qwindowsystem_qws.h)
     650QT_CLASS_LIB(QWSWindow, QtGui, qwindowsystem_qws.h)
     651QT_CLASS_LIB(QWSSoundServer, QtGui, qwindowsystem_qws.h)
     652QT_CLASS_LIB(QWSServer, QtGui, qwindowsystem_qws.h)
     653QT_CLASS_LIB(QWSInputMethod, QtGui, qwindowsystem_qws.h)
     654QT_CLASS_LIB(QWSCursorMap, QtGui, qwindowsystem_qws.h)
     655QT_CLASS_LIB(QWSClient, QtGui, qwindowsystem_qws.h)
     656QT_CLASS_LIB(QWSCursor, QtGui, qwscursor_qws.h)
     657QT_CLASS_LIB(QWSWindowInfo, QtGui, qwsdisplay_qws.h)
     658QT_CLASS_LIB(QWSDisplay, QtGui, qwsdisplay_qws.h)
     659QT_CLASS_LIB(QWSEmbedWidget, QtGui, qwsembedwidget.h)
     660QT_CLASS_LIB(QWSEvent, QtGui, qwsevent_qws.h)
     661QT_CLASS_LIB(QWSManager, QtGui, qwsmanager_qws.h)
     662QT_CLASS_LIB(QWSPropertyManager, QtGui, qwsproperty_qws.h)
     663QT_CLASS_LIB(QWSProtocolItem, QtGui, qwsprotocolitem_qws.h)
     664QT_CLASS_LIB(QWSSocket, QtGui, qwssocket_qws.h)
     665QT_CLASS_LIB(QWSServerSocket, QtGui, qwssocket_qws.h)
    828666QT_CLASS_LIB(QAbstractButton, QtGui, qabstractbutton.h)
    829667QT_CLASS_LIB(QAbstractScrollArea, QtGui, qabstractscrollarea.h)
    … …  
    886724QT_CLASS_LIB(QRegExpValidator, QtGui, qvalidator.h)
    887725QT_CLASS_LIB(QWorkspace, QtGui, qworkspace.h)
     726QT_CLASS_LIB(QInputContext, QtGui, qinputcontext.h)
     727QT_CLASS_LIB(QInputContextFactory, QtGui, qinputcontextfactory.h)
     728QT_CLASS_LIB(QInputContextFactoryInterface, QtGui, qinputcontextplugin.h)
     729QT_CLASS_LIB(QInputContextPlugin, QtGui, qinputcontextplugin.h)
     730QT_CLASS_LIB(QGraphicsAnchor, QtGui, qgraphicsanchorlayout.h)
     731QT_CLASS_LIB(QGraphicsAnchorLayout, QtGui, qgraphicsanchorlayout.h)
     732QT_CLASS_LIB(QGraphicsGridLayout, QtGui, qgraphicsgridlayout.h)
     733QT_CLASS_LIB(QGraphicsItem, QtGui, qgraphicsitem.h)
     734QT_CLASS_LIB(QGraphicsObject, QtGui, qgraphicsitem.h)
     735QT_CLASS_LIB(QAbstractGraphicsShapeItem, QtGui, qgraphicsitem.h)
     736QT_CLASS_LIB(QGraphicsPathItem, QtGui, qgraphicsitem.h)
     737QT_CLASS_LIB(QGraphicsRectItem, QtGui, qgraphicsitem.h)
     738QT_CLASS_LIB(QGraphicsEllipseItem, QtGui, qgraphicsitem.h)
     739QT_CLASS_LIB(QGraphicsPolygonItem, QtGui, qgraphicsitem.h)
     740QT_CLASS_LIB(QGraphicsLineItem, QtGui, qgraphicsitem.h)
     741QT_CLASS_LIB(QGraphicsPixmapItem, QtGui, qgraphicsitem.h)
     742QT_CLASS_LIB(QGraphicsTextItem, QtGui, qgraphicsitem.h)
     743QT_CLASS_LIB(QGraphicsSimpleTextItem, QtGui, qgraphicsitem.h)
     744QT_CLASS_LIB(QGraphicsItemGroup, QtGui, qgraphicsitem.h)
     745QT_CLASS_LIB(QGraphicsItemAnimation, QtGui, qgraphicsitemanimation.h)
     746QT_CLASS_LIB(QGraphicsLayout, QtGui, qgraphicslayout.h)
     747QT_CLASS_LIB(QGraphicsLayoutItem, QtGui, qgraphicslayoutitem.h)
     748QT_CLASS_LIB(QGraphicsLinearLayout, QtGui, qgraphicslinearlayout.h)
     749QT_CLASS_LIB(QGraphicsProxyWidget, QtGui, qgraphicsproxywidget.h)
     750QT_CLASS_LIB(QGraphicsScene, QtGui, qgraphicsscene.h)
     751QT_CLASS_LIB(QGraphicsSceneEvent, QtGui, qgraphicssceneevent.h)
     752QT_CLASS_LIB(QGraphicsSceneMouseEvent, QtGui, qgraphicssceneevent.h)
     753QT_CLASS_LIB(QGraphicsSceneWheelEvent, QtGui, qgraphicssceneevent.h)
     754QT_CLASS_LIB(QGraphicsSceneContextMenuEvent, QtGui, qgraphicssceneevent.h)
     755QT_CLASS_LIB(QGraphicsSceneHoverEvent, QtGui, qgraphicssceneevent.h)
     756QT_CLASS_LIB(QGraphicsSceneHelpEvent, QtGui, qgraphicssceneevent.h)
     757QT_CLASS_LIB(QGraphicsSceneDragDropEvent, QtGui, qgraphicssceneevent.h)
     758QT_CLASS_LIB(QGraphicsSceneResizeEvent, QtGui, qgraphicssceneevent.h)
     759QT_CLASS_LIB(QGraphicsSceneMoveEvent, QtGui, qgraphicssceneevent.h)
     760QT_CLASS_LIB(QGraphicsTransform, QtGui, qgraphicstransform.h)
     761QT_CLASS_LIB(QGraphicsScale, QtGui, qgraphicstransform.h)
     762QT_CLASS_LIB(QGraphicsRotation, QtGui, qgraphicstransform.h)
     763QT_CLASS_LIB(QGraphicsView, QtGui, qgraphicsview.h)
     764QT_CLASS_LIB(QGraphicsWidget, QtGui, qgraphicswidget.h)
     765QT_CLASS_LIB(QGenericMatrix, QtGui, qgenericmatrix.h)
     766QT_CLASS_LIB(QMatrix2x2, QtGui, qgenericmatrix.h)
     767QT_CLASS_LIB(QMatrix2x3, QtGui, qgenericmatrix.h)
     768QT_CLASS_LIB(QMatrix2x4, QtGui, qgenericmatrix.h)
     769QT_CLASS_LIB(QMatrix3x2, QtGui, qgenericmatrix.h)
     770QT_CLASS_LIB(QMatrix3x3, QtGui, qgenericmatrix.h)
     771QT_CLASS_LIB(QMatrix3x4, QtGui, qgenericmatrix.h)
     772QT_CLASS_LIB(QMatrix4x2, QtGui, qgenericmatrix.h)
     773QT_CLASS_LIB(QMatrix4x3, QtGui, qgenericmatrix.h)
     774QT_CLASS_LIB(QMatrix4x4, QtGui, qmatrix4x4.h)
     775QT_CLASS_LIB(QQuaternion, QtGui, qquaternion.h)
     776QT_CLASS_LIB(QVector2D, QtGui, qvector2d.h)
     777QT_CLASS_LIB(QVector3D, QtGui, qvector3d.h)
     778QT_CLASS_LIB(QVector4D, QtGui, qvector4d.h)
     779QT_CLASS_LIB(QFontEngineInfo, QtGui, qabstractfontengine_qws.h)
     780QT_CLASS_LIB(QFontEngineFactoryInterface, QtGui, qabstractfontengine_qws.h)
     781QT_CLASS_LIB(QFontEnginePlugin, QtGui, qabstractfontengine_qws.h)
     782QT_CLASS_LIB(QAbstractFontEngine, QtGui, qabstractfontengine_qws.h)
     783QT_CLASS_LIB(QAbstractTextDocumentLayout, QtGui, qabstracttextdocumentlayout.h)
     784QT_CLASS_LIB(QTextObjectInterface, QtGui, qabstracttextdocumentlayout.h)
     785QT_CLASS_LIB(QFont, QtGui, qfont.h)
     786QT_CLASS_LIB(QFontDatabase, QtGui, qfontdatabase.h)
     787QT_CLASS_LIB(QFontInfo, QtGui, qfontinfo.h)
     788QT_CLASS_LIB(QFontMetrics, QtGui, qfontmetrics.h)
     789QT_CLASS_LIB(QFontMetricsF, QtGui, qfontmetrics.h)
     790QT_CLASS_LIB(QSyntaxHighlighter, QtGui, qsyntaxhighlighter.h)
     791QT_CLASS_LIB(QTextCursor, QtGui, qtextcursor.h)
     792QT_CLASS_LIB(QAbstractUndoItem, QtGui, qtextdocument.h)
     793QT_CLASS_LIB(QTextDocument, QtGui, qtextdocument.h)
     794QT_CLASS_LIB(QTextDocumentFragment, QtGui, qtextdocumentfragment.h)
     795QT_CLASS_LIB(QTextDocumentWriter, QtGui, qtextdocumentwriter.h)
     796QT_CLASS_LIB(QTextLength, QtGui, qtextformat.h)
     797QT_CLASS_LIB(QTextFormat, QtGui, qtextformat.h)
     798QT_CLASS_LIB(QTextCharFormat, QtGui, qtextformat.h)
     799QT_CLASS_LIB(QTextBlockFormat, QtGui, qtextformat.h)
     800QT_CLASS_LIB(QTextListFormat, QtGui, qtextformat.h)
     801QT_CLASS_LIB(QTextImageFormat, QtGui, qtextformat.h)
     802QT_CLASS_LIB(QTextFrameFormat, QtGui, qtextformat.h)
     803QT_CLASS_LIB(QTextTableFormat, QtGui, qtextformat.h)
     804QT_CLASS_LIB(QTextTableCellFormat, QtGui, qtextformat.h)
     805QT_CLASS_LIB(QTextInlineObject, QtGui, qtextlayout.h)
     806QT_CLASS_LIB(QTextLayout, QtGui, qtextlayout.h)
     807QT_CLASS_LIB(QTextLine, QtGui, qtextlayout.h)
     808QT_CLASS_LIB(QTextList, QtGui, qtextlist.h)
     809QT_CLASS_LIB(QTextObject, QtGui, qtextobject.h)
     810QT_CLASS_LIB(QTextBlockGroup, QtGui, qtextobject.h)
     811QT_CLASS_LIB(QTextFrameLayoutData, QtGui, qtextobject.h)
     812QT_CLASS_LIB(QTextFrame, QtGui, qtextobject.h)
     813QT_CLASS_LIB(QTextBlockUserData, QtGui, qtextobject.h)
     814QT_CLASS_LIB(QTextBlock, QtGui, qtextobject.h)
     815QT_CLASS_LIB(QTextFragment, QtGui, qtextobject.h)
     816QT_CLASS_LIB(QTextOption, QtGui, qtextoption.h)
     817QT_CLASS_LIB(QTextTableCell, QtGui, qtexttable.h)
     818QT_CLASS_LIB(QTextTable, QtGui, qtexttable.h)
     819QT_CLASS_LIB(QAbstractPageSetupDialog, QtGui, qabstractpagesetupdialog.h)
     820QT_CLASS_LIB(QAbstractPrintDialog, QtGui, qabstractprintdialog.h)
     821QT_CLASS_LIB(QColorDialog, QtGui, qcolordialog.h)
     822QT_CLASS_LIB(QDialog, QtGui, qdialog.h)
     823QT_CLASS_LIB(QErrorMessage, QtGui, qerrormessage.h)
     824QT_CLASS_LIB(QFileDialog, QtGui, qfiledialog.h)
     825QT_CLASS_LIB(QFileSystemModel, QtGui, qfilesystemmodel.h)
     826QT_CLASS_LIB(QFontDialog, QtGui, qfontdialog.h)
     827QT_CLASS_LIB(QInputDialog, QtGui, qinputdialog.h)
     828QT_CLASS_LIB(QMessageBox, QtGui, qmessagebox.h)
     829QT_CLASS_LIB(QPageSetupDialog, QtGui, qpagesetupdialog.h)
     830QT_CLASS_LIB(QUnixPrintWidget, QtGui, qprintdialog.h)
     831QT_CLASS_LIB(QPrintDialog, QtGui, qprintdialog.h)
     832QT_CLASS_LIB(QPrintPreviewDialog, QtGui, qprintpreviewdialog.h)
     833QT_CLASS_LIB(QProgressDialog, QtGui, qprogressdialog.h)
     834QT_CLASS_LIB(QWizard, QtGui, qwizard.h)
     835QT_CLASS_LIB(QWizardPage, QtGui, qwizard.h)
     836QT_CLASS_LIB(QAccessible, QtGui, qaccessible.h)
     837QT_CLASS_LIB(QAccessibleInterface, QtGui, qaccessible.h)
     838QT_CLASS_LIB(QAccessibleInterfaceEx, QtGui, qaccessible.h)
     839QT_CLASS_LIB(QAccessibleEvent, QtGui, qaccessible.h)
     840QT_CLASS_LIB(QAccessible2Interface, QtGui, qaccessible2.h)
     841QT_CLASS_LIB(QAccessibleTextInterface, QtGui, qaccessible2.h)
     842QT_CLASS_LIB(QAccessibleEditableTextInterface, QtGui, qaccessible2.h)
     843QT_CLASS_LIB(QAccessibleSimpleEditableTextInterface, QtGui, qaccessible2.h)
     844QT_CLASS_LIB(QAccessibleValueInterface, QtGui, qaccessible2.h)
     845QT_CLASS_LIB(QAccessibleTableInterface, QtGui, qaccessible2.h)
     846QT_CLASS_LIB(QAccessibleActionInterface, QtGui, qaccessible2.h)
     847QT_CLASS_LIB(QAccessibleImageInterface, QtGui, qaccessible2.h)
     848QT_CLASS_LIB(QAccessibleBridge, QtGui, qaccessiblebridge.h)
     849QT_CLASS_LIB(QAccessibleBridgeFactoryInterface, QtGui, qaccessiblebridge.h)
     850QT_CLASS_LIB(QAccessibleBridgePlugin, QtGui, qaccessiblebridge.h)
     851QT_CLASS_LIB(QAccessibleObject, QtGui, qaccessibleobject.h)
     852QT_CLASS_LIB(QAccessibleObjectEx, QtGui, qaccessibleobject.h)
     853QT_CLASS_LIB(QAccessibleApplication, QtGui, qaccessibleobject.h)
     854QT_CLASS_LIB(QAccessibleFactoryInterface, QtGui, qaccessibleplugin.h)
     855QT_CLASS_LIB(QAccessiblePlugin, QtGui, qaccessibleplugin.h)
     856QT_CLASS_LIB(QAccessibleWidget, QtGui, qaccessiblewidget.h)
     857QT_CLASS_LIB(QAccessibleWidgetEx, QtGui, qaccessiblewidget.h)
     858QT_CLASS_LIB(QAction, QtGui, qaction.h)
     859QT_CLASS_LIB(QActionGroup, QtGui, qactiongroup.h)
     860QT_CLASS_LIB(QApplication, QtGui, qapplication.h)
     861QT_CLASS_LIB(QBoxLayout, QtGui, qboxlayout.h)
     862QT_CLASS_LIB(QHBoxLayout, QtGui, qboxlayout.h)
     863QT_CLASS_LIB(QVBoxLayout, QtGui, qboxlayout.h)
     864QT_CLASS_LIB(QClipboard, QtGui, qclipboard.h)
     865QT_CLASS_LIB(QCursor, QtGui, qcursor.h)
     866QT_CLASS_LIB(QCursor, QtGui, qcursor.h)
     867QT_CLASS_LIB(QCursorShape, QtGui, qcursor.h)
     868QT_CLASS_LIB(QDesktopWidget, QtGui, qdesktopwidget.h)
     869QT_CLASS_LIB(QDrag, QtGui, qdrag.h)
     870QT_CLASS_LIB(QtEvents, QtGui, qevent.h)
     871QT_CLASS_LIB(QInputEvent, QtGui, qevent.h)
     872QT_CLASS_LIB(QMouseEvent, QtGui, qevent.h)
     873QT_CLASS_LIB(QHoverEvent, QtGui, qevent.h)
     874QT_CLASS_LIB(QWheelEvent, QtGui, qevent.h)
     875QT_CLASS_LIB(QTabletEvent, QtGui, qevent.h)
     876QT_CLASS_LIB(QKeyEvent, QtGui, qevent.h)
     877QT_CLASS_LIB(QFocusEvent, QtGui, qevent.h)
     878QT_CLASS_LIB(QPaintEvent, QtGui, qevent.h)
     879QT_CLASS_LIB(QUpdateLaterEvent, QtGui, qevent.h)
     880QT_CLASS_LIB(QMoveEvent, QtGui, qevent.h)
     881QT_CLASS_LIB(QResizeEvent, QtGui, qevent.h)
     882QT_CLASS_LIB(QCloseEvent, QtGui, qevent.h)
     883QT_CLASS_LIB(QIconDragEvent, QtGui, qevent.h)
     884QT_CLASS_LIB(QShowEvent, QtGui, qevent.h)
     885QT_CLASS_LIB(QHideEvent, QtGui, qevent.h)
     886QT_CLASS_LIB(QContextMenuEvent, QtGui, qevent.h)
     887QT_CLASS_LIB(QInputMethodEvent, QtGui, qevent.h)
     888QT_CLASS_LIB(QDropEvent, QtGui, qevent.h)
     889QT_CLASS_LIB(QDragMoveEvent, QtGui, qevent.h)
     890QT_CLASS_LIB(QDragEnterEvent, QtGui, qevent.h)
     891QT_CLASS_LIB(QDragResponseEvent, QtGui, qevent.h)
     892QT_CLASS_LIB(QDragLeaveEvent, QtGui, qevent.h)
     893QT_CLASS_LIB(QHelpEvent, QtGui, qevent.h)
     894QT_CLASS_LIB(QStatusTipEvent, QtGui, qevent.h)
     895QT_CLASS_LIB(QWhatsThisClickedEvent, QtGui, qevent.h)
     896QT_CLASS_LIB(QActionEvent, QtGui, qevent.h)
     897QT_CLASS_LIB(QFileOpenEvent, QtGui, qevent.h)
     898QT_CLASS_LIB(QToolBarChangeEvent, QtGui, qevent.h)
     899QT_CLASS_LIB(QShortcutEvent, QtGui, qevent.h)
     900QT_CLASS_LIB(QClipboardEvent, QtGui, qevent.h)
     901QT_CLASS_LIB(QWindowStateChangeEvent, QtGui, qevent.h)
     902QT_CLASS_LIB(QMenubarUpdatedEvent, QtGui, qevent.h)
     903QT_CLASS_LIB(QTouchEvent, QtGui, qevent.h)
     904QT_CLASS_LIB(QGestureEvent, QtGui, qevent.h)
     905QT_CLASS_LIB(QFormLayout, QtGui, qformlayout.h)
     906QT_CLASS_LIB(QGesture, QtGui, qgesture.h)
     907QT_CLASS_LIB(QPanGesture, QtGui, qgesture.h)
     908QT_CLASS_LIB(QPinchGesture, QtGui, qgesture.h)
     909QT_CLASS_LIB(QSwipeGesture, QtGui, qgesture.h)
     910QT_CLASS_LIB(QTapGesture, QtGui, qgesture.h)
     911QT_CLASS_LIB(QTapAndHoldGesture, QtGui, qgesture.h)
     912QT_CLASS_LIB(QGestureRecognizer, QtGui, qgesturerecognizer.h)
     913QT_CLASS_LIB(QGridLayout, QtGui, qgridlayout.h)
     914QT_CLASS_LIB(QKeySequence, QtGui, qkeysequence.h)
     915QT_CLASS_LIB(QKeySequence, QtGui, qkeysequence.h)
     916QT_CLASS_LIB(QLayoutIterator, QtGui, qlayout.h)
     917QT_CLASS_LIB(QLayout, QtGui, qlayout.h)
     918QT_CLASS_LIB(QLayoutItem, QtGui, qlayoutitem.h)
     919QT_CLASS_LIB(QSpacerItem, QtGui, qlayoutitem.h)
     920QT_CLASS_LIB(QWidgetItem, QtGui, qlayoutitem.h)
     921QT_CLASS_LIB(QWidgetItemV2, QtGui, qlayoutitem.h)
     922QT_CLASS_LIB(QMimeSource, QtGui, qmime.h)
     923QT_CLASS_LIB(QWindowsMime, QtGui, qmime.h)
     924QT_CLASS_LIB(QMacMime, QtGui, qmime.h)
     925QT_CLASS_LIB(QMacPasteboardMime, QtGui, qmime.h)
     926QT_CLASS_LIB(QPalette, QtGui, qpalette.h)
     927QT_CLASS_LIB(QColorGroup, QtGui, qpalette.h)
     928QT_CLASS_LIB(QSessionManager, QtGui, qsessionmanager.h)
     929QT_CLASS_LIB(QShortcut, QtGui, qshortcut.h)
     930QT_CLASS_LIB(QSizePolicy, QtGui, qsizepolicy.h)
     931QT_CLASS_LIB(QSound, QtGui, qsound.h)
     932QT_CLASS_LIB(QStackedLayout, QtGui, qstackedlayout.h)
     933QT_CLASS_LIB(QToolTip, QtGui, qtooltip.h)
     934QT_CLASS_LIB(QWhatsThis, QtGui, qwhatsthis.h)
     935QT_CLASS_LIB(QWidgetData, QtGui, qwidget.h)
     936QT_CLASS_LIB(QWidget, QtGui, qwidget.h)
     937QT_CLASS_LIB(QWidgetAction, QtGui, qwidgetaction.h)
     938QT_CLASS_LIB(QWidgetList, QtGui, qwindowdefs.h)
     939QT_CLASS_LIB(QWidgetMapper, QtGui, qwindowdefs.h)
     940QT_CLASS_LIB(QWidgetSet, QtGui, qwindowdefs.h)
     941QT_CLASS_LIB(QX11EmbedWidget, QtGui, qx11embed_x11.h)
     942QT_CLASS_LIB(QX11EmbedContainer, QtGui, qx11embed_x11.h)
     943QT_CLASS_LIB(QX11Info, QtGui, qx11info_x11.h)
     944QT_CLASS_LIB(QAbstractItemDelegate, QtGui, qabstractitemdelegate.h)
     945QT_CLASS_LIB(QAbstractItemView, QtGui, qabstractitemview.h)
     946QT_CLASS_LIB(QAbstractProxyModel, QtGui, qabstractproxymodel.h)
     947QT_CLASS_LIB(QColumnView, QtGui, qcolumnview.h)
     948QT_CLASS_LIB(QDataWidgetMapper, QtGui, qdatawidgetmapper.h)
     949QT_CLASS_LIB(QDirModel, QtGui, qdirmodel.h)
     950QT_CLASS_LIB(QFileIconProvider, QtGui, qfileiconprovider.h)
     951QT_CLASS_LIB(QHeaderView, QtGui, qheaderview.h)
     952QT_CLASS_LIB(QItemDelegate, QtGui, qitemdelegate.h)
     953QT_CLASS_LIB(QItemEditorCreatorBase, QtGui, qitemeditorfactory.h)
     954QT_CLASS_LIB(QItemEditorCreator, QtGui, qitemeditorfactory.h)
     955QT_CLASS_LIB(QStandardItemEditorCreator, QtGui, qitemeditorfactory.h)
     956QT_CLASS_LIB(QItemEditorFactory, QtGui, qitemeditorfactory.h)
     957QT_CLASS_LIB(QItemSelectionRange, QtGui, qitemselectionmodel.h)
     958QT_CLASS_LIB(QItemSelectionModel, QtGui, qitemselectionmodel.h)
     959QT_CLASS_LIB(QItemSelection, QtGui, qitemselectionmodel.h)
     960QT_CLASS_LIB(QListView, QtGui, qlistview.h)
     961QT_CLASS_LIB(QListWidgetItem, QtGui, qlistwidget.h)
     962QT_CLASS_LIB(QListWidget, QtGui, qlistwidget.h)
     963QT_CLASS_LIB(QProxyModel, QtGui, qproxymodel.h)
     964QT_CLASS_LIB(QSortFilterProxyModel, QtGui, qsortfilterproxymodel.h)
     965QT_CLASS_LIB(QStandardItem, QtGui, qstandarditemmodel.h)
     966QT_CLASS_LIB(QStandardItemModel, QtGui, qstandarditemmodel.h)
     967QT_CLASS_LIB(QStringListModel, QtGui, qstringlistmodel.h)
     968QT_CLASS_LIB(QStyledItemDelegate, QtGui, qstyleditemdelegate.h)
     969QT_CLASS_LIB(QTableView, QtGui, qtableview.h)
     970QT_CLASS_LIB(QTableWidgetSelectionRange, QtGui, qtablewidget.h)
     971QT_CLASS_LIB(QTableWidgetItem, QtGui, qtablewidget.h)
     972QT_CLASS_LIB(QTableWidget, QtGui, qtablewidget.h)
     973QT_CLASS_LIB(QTreeView, QtGui, qtreeview.h)
     974QT_CLASS_LIB(QTreeWidgetItem, QtGui, qtreewidget.h)
     975QT_CLASS_LIB(QTreeWidget, QtGui, qtreewidget.h)
     976QT_CLASS_LIB(QTreeWidgetItemIterator, QtGui, qtreewidgetitemiterator.h)
     977QT_CLASS_LIB(QBrush, QtGui, qbrush.h)
     978QT_CLASS_LIB(QBrushData, QtGui, qbrush.h)
     979QT_CLASS_LIB(QGradientStop, QtGui, qbrush.h)
     980QT_CLASS_LIB(QGradientStops, QtGui, qbrush.h)
     981QT_CLASS_LIB(QGradient, QtGui, qbrush.h)
     982QT_CLASS_LIB(QLinearGradient, QtGui, qbrush.h)
     983QT_CLASS_LIB(QRadialGradient, QtGui, qbrush.h)
     984QT_CLASS_LIB(QConicalGradient, QtGui, qbrush.h)
     985QT_CLASS_LIB(QColor, QtGui, qcolor.h)
     986QT_CLASS_LIB(QColormap, QtGui, qcolormap.h)
     987QT_CLASS_LIB(QTileRules, QtGui, qdrawutil.h)
     988QT_CLASS_LIB(QMatrix, QtGui, qmatrix.h)
     989QT_CLASS_LIB(QPaintDevice, QtGui, qpaintdevice.h)
     990QT_CLASS_LIB(QTextItem, QtGui, qpaintengine.h)
     991QT_CLASS_LIB(QPaintEngine, QtGui, qpaintengine.h)
     992QT_CLASS_LIB(QPaintEngineState, QtGui, qpaintengine.h)
     993QT_CLASS_LIB(QPainter, QtGui, qpainter.h)
     994QT_CLASS_LIB(QPainterPath, QtGui, qpainterpath.h)
     995QT_CLASS_LIB(QPainterPathPrivate, QtGui, qpainterpath.h)
     996QT_CLASS_LIB(QPainterPathStroker, QtGui, qpainterpath.h)
     997QT_CLASS_LIB(QPen, QtGui, qpen.h)
     998QT_CLASS_LIB(QPolygon, QtGui, qpolygon.h)
     999QT_CLASS_LIB(QPolygonF, QtGui, qpolygon.h)
     1000QT_CLASS_LIB(QPrintEngine, QtGui, qprintengine.h)
     1001QT_CLASS_LIB(QPrinter, QtGui, qprinter.h)
     1002QT_CLASS_LIB(QPrinterInfo, QtGui, qprinterinfo.h)
     1003QT_CLASS_LIB(QRegion, QtGui, qregion.h)
     1004QT_CLASS_LIB(QRgb, QtGui, qrgb.h)
     1005QT_CLASS_LIB(QStylePainter, QtGui, qstylepainter.h)
     1006QT_CLASS_LIB(QTransform, QtGui, qtransform.h)
     1007QT_CLASS_LIB(QWMatrix, QtGui, qwmatrix.h)
     1008QT_CLASS_LIB(QSymbianEvent, QtGui, qsymbianevent.h)
     1009QT_CLASS_LIB(QCDEStyle, QtGui, qcdestyle.h)
     1010QT_CLASS_LIB(QCleanlooksStyle, QtGui, qcleanlooksstyle.h)
     1011QT_CLASS_LIB(QCommonStyle, QtGui, qcommonstyle.h)
     1012QT_CLASS_LIB(QGtkStyle, QtGui, qgtkstyle.h)
     1013QT_CLASS_LIB(QMacStyle, QtGui, qmacstyle_mac.h)
     1014QT_CLASS_LIB(QMotifStyle, QtGui, qmotifstyle.h)
     1015QT_CLASS_LIB(QPlastiqueStyle, QtGui, qplastiquestyle.h)
     1016QT_CLASS_LIB(QProxyStyle, QtGui, qproxystyle.h)
     1017QT_CLASS_LIB(QS60Style, QtGui, qs60style.h)
     1018QT_CLASS_LIB(QStyle, QtGui, qstyle.h)
     1019QT_CLASS_LIB(QStyleFactory, QtGui, qstylefactory.h)
     1020QT_CLASS_LIB(QStyleOption, QtGui, qstyleoption.h)
     1021QT_CLASS_LIB(QStyleOptionFocusRect, QtGui, qstyleoption.h)
     1022QT_CLASS_LIB(QStyleOptionFrame, QtGui, qstyleoption.h)
     1023QT_CLASS_LIB(QStyleOptionFrameV2, QtGui, qstyleoption.h)
     1024QT_CLASS_LIB(QStyleOptionFrameV3, QtGui, qstyleoption.h)
     1025QT_CLASS_LIB(QStyleOptionTabWidgetFrame, QtGui, qstyleoption.h)
     1026QT_CLASS_LIB(QStyleOptionTabWidgetFrameV2, QtGui, qstyleoption.h)
     1027QT_CLASS_LIB(QStyleOptionTabBarBase, QtGui, qstyleoption.h)
     1028QT_CLASS_LIB(QStyleOptionTabBarBaseV2, QtGui, qstyleoption.h)
     1029QT_CLASS_LIB(QStyleOptionHeader, QtGui, qstyleoption.h)
     1030QT_CLASS_LIB(QStyleOptionButton, QtGui, qstyleoption.h)
     1031QT_CLASS_LIB(QStyleOptionTab, QtGui, qstyleoption.h)
     1032QT_CLASS_LIB(QStyleOptionTabV2, QtGui, qstyleoption.h)
     1033QT_CLASS_LIB(QStyleOptionTabV3, QtGui, qstyleoption.h)
     1034QT_CLASS_LIB(QStyleOptionToolBar, QtGui, qstyleoption.h)
     1035QT_CLASS_LIB(QStyleOptionProgressBar, QtGui, qstyleoption.h)
     1036QT_CLASS_LIB(QStyleOptionProgressBarV2, QtGui, qstyleoption.h)
     1037QT_CLASS_LIB(QStyleOptionMenuItem, QtGui, qstyleoption.h)
     1038QT_CLASS_LIB(QStyleOptionQ3ListViewItem, QtGui, qstyleoption.h)
     1039QT_CLASS_LIB(QStyleOptionQ3DockWindow, QtGui, qstyleoption.h)
     1040QT_CLASS_LIB(QStyleOptionDockWidget, QtGui, qstyleoption.h)
     1041QT_CLASS_LIB(QStyleOptionDockWidgetV2, QtGui, qstyleoption.h)
     1042QT_CLASS_LIB(QStyleOptionViewItem, QtGui, qstyleoption.h)
     1043QT_CLASS_LIB(QStyleOptionViewItemV2, QtGui, qstyleoption.h)
     1044QT_CLASS_LIB(QStyleOptionViewItemV3, QtGui, qstyleoption.h)
     1045QT_CLASS_LIB(QStyleOptionViewItemV4, QtGui, qstyleoption.h)
     1046QT_CLASS_LIB(QStyleOptionToolBox, QtGui, qstyleoption.h)
     1047QT_CLASS_LIB(QStyleOptionToolBoxV2, QtGui, qstyleoption.h)
     1048QT_CLASS_LIB(QStyleOptionRubberBand, QtGui, qstyleoption.h)
     1049QT_CLASS_LIB(QStyleOptionComplex, QtGui, qstyleoption.h)
     1050QT_CLASS_LIB(QStyleOptionSlider, QtGui, qstyleoption.h)
     1051QT_CLASS_LIB(QStyleOptionSpinBox, QtGui, qstyleoption.h)
     1052QT_CLASS_LIB(QStyleOptionQ3ListView, QtGui, qstyleoption.h)
     1053QT_CLASS_LIB(QStyleOptionToolButton, QtGui, qstyleoption.h)
     1054QT_CLASS_LIB(QStyleOptionComboBox, QtGui, qstyleoption.h)
     1055QT_CLASS_LIB(QStyleOptionTitleBar, QtGui, qstyleoption.h)
     1056QT_CLASS_LIB(QStyleOptionGroupBox, QtGui, qstyleoption.h)
     1057QT_CLASS_LIB(QStyleOptionSizeGrip, QtGui, qstyleoption.h)
     1058QT_CLASS_LIB(QStyleOptionGraphicsItem, QtGui, qstyleoption.h)
     1059QT_CLASS_LIB(QStyleHintReturn, QtGui, qstyleoption.h)
     1060QT_CLASS_LIB(QStyleHintReturnMask, QtGui, qstyleoption.h)
     1061QT_CLASS_LIB(QStyleHintReturnVariant, QtGui, qstyleoption.h)
     1062QT_CLASS_LIB(QStyleFactoryInterface, QtGui, qstyleplugin.h)
     1063QT_CLASS_LIB(QStylePlugin, QtGui, qstyleplugin.h)
     1064QT_CLASS_LIB(QWindowsCEStyle, QtGui, qwindowscestyle.h)
     1065QT_CLASS_LIB(QWindowsMobileStyle, QtGui, qwindowsmobilestyle.h)
     1066QT_CLASS_LIB(QWindowsStyle, QtGui, qwindowsstyle.h)
     1067QT_CLASS_LIB(QWindowsVistaStyle, QtGui, qwindowsvistastyle.h)
     1068QT_CLASS_LIB(QWindowsXPStyle, QtGui, qwindowsxpstyle.h)
     1069QT_CLASS_LIB(QKeyEventTransition, QtGui, qkeyeventtransition.h)
     1070QT_CLASS_LIB(QMouseEventTransition, QtGui, qmouseeventtransition.h)
     1071QT_CLASS_LIB(QGraphicsEffect, QtGui, qgraphicseffect.h)
     1072QT_CLASS_LIB(QGraphicsColorizeEffect, QtGui, qgraphicseffect.h)
     1073QT_CLASS_LIB(QGraphicsBlurEffect, QtGui, qgraphicseffect.h)
     1074QT_CLASS_LIB(QGraphicsDropShadowEffect, QtGui, qgraphicseffect.h)
     1075QT_CLASS_LIB(QGraphicsOpacityEffect, QtGui, qgraphicseffect.h)
     1076QT_CLASS_LIB(QCompleter, QtGui, qcompleter.h)
     1077QT_CLASS_LIB(QDesktopServices, QtGui, qdesktopservices.h)
     1078QT_CLASS_LIB(QSystemTrayIcon, QtGui, qsystemtrayicon.h)
     1079QT_CLASS_LIB(QUndoGroup, QtGui, qundogroup.h)
     1080QT_CLASS_LIB(QUndoCommand, QtGui, qundostack.h)
     1081QT_CLASS_LIB(QUndoStack, QtGui, qundostack.h)
     1082QT_CLASS_LIB(QUndoView, QtGui, qundoview.h)
    8881083QT_CLASS_LIB(QScriptEngineDebugger, QtScriptTools, qscriptenginedebugger.h)
    8891084QT_CLASS_LIB(QUiLoader, QtUiTools, quiloader.h)
    … …  
    9621157QT_CLASS_LIB(Phonon::SubtitleDescriptionModel, phonon, objectdescriptionmodel.h)
    9631158QT_CLASS_LIB(Phonon::Path, phonon, path.h)
     1159QT_CLASS_LIB(Phonon::Global, phonon, phononnamespace.h)
    9641160QT_CLASS_LIB(Phonon::PlatformPlugin, phonon, platformplugin.h)
    9651161QT_CLASS_LIB(Phonon::SeekSlider, phonon, seekslider.h)
    … …  
    9751171QT_CLASS_LIB(QSvgRenderer, QtSvg, qsvgrenderer.h)
    9761172QT_CLASS_LIB(QSvgWidget, QtSvg, qsvgwidget.h)
    977 QT_CLASS_LIB(Q3CanvasItemList, Qt3Support, q3canvas.h)
    978 QT_CLASS_LIB(Q3CanvasItem, Qt3Support, q3canvas.h)
    979 QT_CLASS_LIB(Q3Canvas, Qt3Support, q3canvas.h)
    980 QT_CLASS_LIB(Q3CanvasView, Qt3Support, q3canvas.h)
    981 QT_CLASS_LIB(Q3CanvasPixmap, Qt3Support, q3canvas.h)
    982 QT_CLASS_LIB(Q3CanvasPixmapArray, Qt3Support, q3canvas.h)
    983 QT_CLASS_LIB(Q3CanvasSprite, Qt3Support, q3canvas.h)
    984 QT_CLASS_LIB(Q3CanvasPolygonalItem, Qt3Support, q3canvas.h)
    985 QT_CLASS_LIB(Q3CanvasRectangle, Qt3Support, q3canvas.h)
    986 QT_CLASS_LIB(Q3CanvasPolygon, Qt3Support, q3canvas.h)
    987 QT_CLASS_LIB(Q3CanvasSpline, Qt3Support, q3canvas.h)
    988 QT_CLASS_LIB(Q3CanvasLine, Qt3Support, q3canvas.h)
    989 QT_CLASS_LIB(Q3CanvasEllipse, Qt3Support, q3canvas.h)
    990 QT_CLASS_LIB(Q3CanvasText, Qt3Support, q3canvas.h)
    991 QT_CLASS_LIB(Q3FileIconProvider, Qt3Support, q3filedialog.h)
    992 QT_CLASS_LIB(Q3FilePreview, Qt3Support, q3filedialog.h)
    993 QT_CLASS_LIB(Q3FileDialog, Qt3Support, q3filedialog.h)
    994 QT_CLASS_LIB(Q3ProgressDialog, Qt3Support, q3progressdialog.h)
    995 QT_CLASS_LIB(Q3TabDialog, Qt3Support, q3tabdialog.h)
    996 QT_CLASS_LIB(Q3Wizard, Qt3Support, q3wizard.h)
    997 QT_CLASS_LIB(Q3IconDragItem, Qt3Support, q3iconview.h)
    998 QT_CLASS_LIB(Q3IconDrag, Qt3Support, q3iconview.h)
    999 QT_CLASS_LIB(Q3IconViewItem, Qt3Support, q3iconview.h)
    1000 QT_CLASS_LIB(Q3IconView, Qt3Support, q3iconview.h)
    1001 QT_CLASS_LIB(Q3ListBox, Qt3Support, q3listbox.h)
    1002 QT_CLASS_LIB(Q3ListBoxItem, Qt3Support, q3listbox.h)
    1003 QT_CLASS_LIB(Q3ListBoxText, Qt3Support, q3listbox.h)
    1004 QT_CLASS_LIB(Q3ListBoxPixmap, Qt3Support, q3listbox.h)
    1005 QT_CLASS_LIB(Q3ListViewItem, Qt3Support, q3listview.h)
    1006 QT_CLASS_LIB(Q3ListView, Qt3Support, q3listview.h)
    1007 QT_CLASS_LIB(Q3CheckListItem, Qt3Support, q3listview.h)
    1008 QT_CLASS_LIB(Q3ListViewItemIterator, Qt3Support, q3listview.h)
    1009 QT_CLASS_LIB(Q3TableSelection, Qt3Support, q3table.h)
    1010 QT_CLASS_LIB(Q3TableItem, Qt3Support, q3table.h)
    1011 QT_CLASS_LIB(Q3ComboTableItem, Qt3Support, q3table.h)
    1012 QT_CLASS_LIB(Q3CheckTableItem, Qt3Support, q3table.h)
    1013 QT_CLASS_LIB(Q3Table, Qt3Support, q3table.h)
     1173QT_CLASS_LIB(Q3Action, Qt3Support, q3action.h)
     1174QT_CLASS_LIB(Q3ActionGroup, Qt3Support, q3action.h)
     1175QT_CLASS_LIB(Q3Button, Qt3Support, q3button.h)
     1176QT_CLASS_LIB(Q3ButtonGroup, Qt3Support, q3buttongroup.h)
     1177QT_CLASS_LIB(Q3VButtonGroup, Qt3Support, q3buttongroup.h)
     1178QT_CLASS_LIB(Q3HButtonGroup, Qt3Support, q3buttongroup.h)
     1179QT_CLASS_LIB(Q3ComboBox, Qt3Support, q3combobox.h)
     1180QT_CLASS_LIB(Q3DateTimeEditBase, Qt3Support, q3datetimeedit.h)
     1181QT_CLASS_LIB(Q3DateEdit, Qt3Support, q3datetimeedit.h)
     1182QT_CLASS_LIB(Q3TimeEdit, Qt3Support, q3datetimeedit.h)
     1183QT_CLASS_LIB(Q3DateTimeEdit, Qt3Support, q3datetimeedit.h)
     1184QT_CLASS_LIB(Q3DockAreaLayout, Qt3Support, q3dockarea.h)
     1185QT_CLASS_LIB(Q3DockArea, Qt3Support, q3dockarea.h)
     1186QT_CLASS_LIB(Q3DockWindow, Qt3Support, q3dockwindow.h)
     1187QT_CLASS_LIB(Q3Frame, Qt3Support, q3frame.h)
     1188QT_CLASS_LIB(Q3Grid, Qt3Support, q3grid.h)
     1189QT_CLASS_LIB(Q3GridView, Qt3Support, q3gridview.h)
     1190QT_CLASS_LIB(Q3GroupBox, Qt3Support, q3groupbox.h)
     1191QT_CLASS_LIB(Q3HBox, Qt3Support, q3hbox.h)
     1192QT_CLASS_LIB(Q3Header, Qt3Support, q3header.h)
     1193QT_CLASS_LIB(Q3HGroupBox, Qt3Support, q3hgroupbox.h)
     1194QT_CLASS_LIB(Q3MainWindow, Qt3Support, q3mainwindow.h)
     1195QT_CLASS_LIB(Q3PopupMenu, Qt3Support, q3popupmenu.h)
     1196QT_CLASS_LIB(Q3ProgressBar, Qt3Support, q3progressbar.h)
     1197QT_CLASS_LIB(Q3RangeControl, Qt3Support, q3rangecontrol.h)
     1198QT_CLASS_LIB(Q3SpinWidget, Qt3Support, q3rangecontrol.h)
     1199QT_CLASS_LIB(Q3ScrollView, Qt3Support, q3scrollview.h)
     1200QT_CLASS_LIB(Q3ToolBar, Qt3Support, q3toolbar.h)
     1201QT_CLASS_LIB(Q3VBox, Qt3Support, q3vbox.h)
     1202QT_CLASS_LIB(Q3VGroupBox, Qt3Support, q3vgroupbox.h)
     1203QT_CLASS_LIB(Q3WhatsThis, Qt3Support, q3whatsthis.h)
     1204QT_CLASS_LIB(Q3WidgetStack, Qt3Support, q3widgetstack.h)
     1205QT_CLASS_LIB(Q3DataBrowser, Qt3Support, q3databrowser.h)
     1206QT_CLASS_LIB(Q3DataTable, Qt3Support, q3datatable.h)
     1207QT_CLASS_LIB(Q3DataView, Qt3Support, q3dataview.h)
     1208QT_CLASS_LIB(Q3EditorFactory, Qt3Support, q3editorfactory.h)
     1209QT_CLASS_LIB(Q3SqlCursor, Qt3Support, q3sqlcursor.h)
     1210QT_CLASS_LIB(Q3SqlEditorFactory, Qt3Support, q3sqleditorfactory.h)
     1211QT_CLASS_LIB(Q3SqlFieldInfo, Qt3Support, q3sqlfieldinfo.h)
     1212QT_CLASS_LIB(Q3SqlForm, Qt3Support, q3sqlform.h)
     1213QT_CLASS_LIB(Q3SqlPropertyMap, Qt3Support, q3sqlpropertymap.h)
     1214QT_CLASS_LIB(Q3SqlFieldInfoList, Qt3Support, q3sqlrecordinfo.h)
     1215QT_CLASS_LIB(Q3SqlRecordInfo, Qt3Support, q3sqlrecordinfo.h)
     1216QT_CLASS_LIB(Q3SqlSelectCursor, Qt3Support, q3sqlselectcursor.h)
    10141217QT_CLASS_LIB(Q3Dns, Qt3Support, q3dns.h)
    10151218QT_CLASS_LIB(Q3DnsSocket, Qt3Support, q3dns.h)
    … …  
    10301233QT_CLASS_LIB(Q3Url, Qt3Support, q3url.h)
    10311234QT_CLASS_LIB(Q3UrlOperator, Qt3Support, q3urloperator.h)
     1235QT_CLASS_LIB(Q3MultiLineEdit, Qt3Support, q3multilineedit.h)
     1236QT_CLASS_LIB(Q3SimpleRichText, Qt3Support, q3simplerichtext.h)
     1237QT_CLASS_LIB(Q3StyleSheetItem, Qt3Support, q3stylesheet.h)
     1238QT_CLASS_LIB(Q3StyleSheet, Qt3Support, q3stylesheet.h)
     1239QT_CLASS_LIB(Q3SyntaxHighlighter, Qt3Support, q3syntaxhighlighter.h)
     1240QT_CLASS_LIB(Q3TextBrowser, Qt3Support, q3textbrowser.h)
     1241QT_CLASS_LIB(Q3TextEditOptimPrivate, Qt3Support, q3textedit.h)
     1242QT_CLASS_LIB(Q3TextEdit, Qt3Support, q3textedit.h)
     1243QT_CLASS_LIB(Q3TextStream, Qt3Support, q3textstream.h)
     1244QT_CLASS_LIB(Q3TSFUNC, Qt3Support, q3textstream.h)
     1245QT_CLASS_LIB(Q3TextView, Qt3Support, q3textview.h)
     1246QT_CLASS_LIB(Q3FileIconProvider, Qt3Support, q3filedialog.h)
     1247QT_CLASS_LIB(Q3FilePreview, Qt3Support, q3filedialog.h)
     1248QT_CLASS_LIB(Q3FileDialog, Qt3Support, q3filedialog.h)
     1249QT_CLASS_LIB(Q3ProgressDialog, Qt3Support, q3progressdialog.h)
     1250QT_CLASS_LIB(Q3TabDialog, Qt3Support, q3tabdialog.h)
     1251QT_CLASS_LIB(Q3Wizard, Qt3Support, q3wizard.h)
    10321252QT_CLASS_LIB(Q3Accel, Qt3Support, q3accel.h)
    10331253QT_CLASS_LIB(Q3BoxLayout, Qt3Support, q3boxlayout.h)
    … …  
    10451265QT_CLASS_LIB(Q3PolygonScanner, Qt3Support, q3polygonscanner.h)
    10461266QT_CLASS_LIB(Q3Process, Qt3Support, q3process.h)
    1047 QT_CLASS_LIB(Q3PaintDeviceMetrics, Qt3Support, q3paintdevicemetrics.h)
    1048 QT_CLASS_LIB(Q3Painter, Qt3Support, q3painter.h)
    1049 QT_CLASS_LIB(Q3Picture, Qt3Support, q3picture.h)
    1050 QT_CLASS_LIB(Q3PointArray, Qt3Support, q3pointarray.h)
    1051 QT_CLASS_LIB(Q3DataBrowser, Qt3Support, q3databrowser.h)
    1052 QT_CLASS_LIB(Q3DataTable, Qt3Support, q3datatable.h)
    1053 QT_CLASS_LIB(Q3DataView, Qt3Support, q3dataview.h)
    1054 QT_CLASS_LIB(Q3EditorFactory, Qt3Support, q3editorfactory.h)
    1055 QT_CLASS_LIB(Q3SqlCursor, Qt3Support, q3sqlcursor.h)
    1056 QT_CLASS_LIB(Q3SqlEditorFactory, Qt3Support, q3sqleditorfactory.h)
    1057 QT_CLASS_LIB(Q3SqlFieldInfo, Qt3Support, q3sqlfieldinfo.h)
    1058 QT_CLASS_LIB(Q3SqlForm, Qt3Support, q3sqlform.h)
    1059 QT_CLASS_LIB(Q3SqlPropertyMap, Qt3Support, q3sqlpropertymap.h)
    1060 QT_CLASS_LIB(Q3SqlFieldInfoList, Qt3Support, q3sqlrecordinfo.h)
    1061 QT_CLASS_LIB(Q3SqlRecordInfo, Qt3Support, q3sqlrecordinfo.h)
    1062 QT_CLASS_LIB(Q3SqlSelectCursor, Qt3Support, q3sqlselectcursor.h)
    1063 QT_CLASS_LIB(Q3MultiLineEdit, Qt3Support, q3multilineedit.h)
    1064 QT_CLASS_LIB(Q3SimpleRichText, Qt3Support, q3simplerichtext.h)
    1065 QT_CLASS_LIB(Q3StyleSheetItem, Qt3Support, q3stylesheet.h)
    1066 QT_CLASS_LIB(Q3StyleSheet, Qt3Support, q3stylesheet.h)
    1067 QT_CLASS_LIB(Q3SyntaxHighlighter, Qt3Support, q3syntaxhighlighter.h)
    1068 QT_CLASS_LIB(Q3TextBrowser, Qt3Support, q3textbrowser.h)
    1069 QT_CLASS_LIB(Q3TextEditOptimPrivate, Qt3Support, q3textedit.h)
    1070 QT_CLASS_LIB(Q3TextEdit, Qt3Support, q3textedit.h)
    1071 QT_CLASS_LIB(Q3TextStream, Qt3Support, q3textstream.h)
    1072 QT_CLASS_LIB(Q3TSFUNC, Qt3Support, q3textstream.h)
    1073 QT_CLASS_LIB(Q3TextView, Qt3Support, q3textview.h)
    10741267QT_CLASS_LIB(Q3AsciiCache, Qt3Support, q3asciicache.h)
    10751268QT_CLASS_LIB(Q3AsciiCacheIterator, Qt3Support, q3asciicache.h)
    … …  
    11291322QT_CLASS_LIB(Q3ValueStack, Qt3Support, q3valuestack.h)
    11301323QT_CLASS_LIB(Q3ValueVector, Qt3Support, q3valuevector.h)
    1131 QT_CLASS_LIB(Q3Action, Qt3Support, q3action.h)
    1132 QT_CLASS_LIB(Q3ActionGroup, Qt3Support, q3action.h)
    1133 QT_CLASS_LIB(Q3Button, Qt3Support, q3button.h)
    1134 QT_CLASS_LIB(Q3ButtonGroup, Qt3Support, q3buttongroup.h)
    1135 QT_CLASS_LIB(Q3VButtonGroup, Qt3Support, q3buttongroup.h)
    1136 QT_CLASS_LIB(Q3HButtonGroup, Qt3Support, q3buttongroup.h)
    1137 QT_CLASS_LIB(Q3ComboBox, Qt3Support, q3combobox.h)
    1138 QT_CLASS_LIB(Q3DateTimeEditBase, Qt3Support, q3datetimeedit.h)
    1139 QT_CLASS_LIB(Q3DateEdit, Qt3Support, q3datetimeedit.h)
    1140 QT_CLASS_LIB(Q3TimeEdit, Qt3Support, q3datetimeedit.h)
    1141 QT_CLASS_LIB(Q3DateTimeEdit, Qt3Support, q3datetimeedit.h)
    1142 QT_CLASS_LIB(Q3DockAreaLayout, Qt3Support, q3dockarea.h)
    1143 QT_CLASS_LIB(Q3DockArea, Qt3Support, q3dockarea.h)
    1144 QT_CLASS_LIB(Q3DockWindow, Qt3Support, q3dockwindow.h)
    1145 QT_CLASS_LIB(Q3Frame, Qt3Support, q3frame.h)
    1146 QT_CLASS_LIB(Q3Grid, Qt3Support, q3grid.h)
    1147 QT_CLASS_LIB(Q3GridView, Qt3Support, q3gridview.h)
    1148 QT_CLASS_LIB(Q3GroupBox, Qt3Support, q3groupbox.h)
    1149 QT_CLASS_LIB(Q3HBox, Qt3Support, q3hbox.h)
    1150 QT_CLASS_LIB(Q3Header, Qt3Support, q3header.h)
    1151 QT_CLASS_LIB(Q3HGroupBox, Qt3Support, q3hgroupbox.h)
    1152 QT_CLASS_LIB(Q3MainWindow, Qt3Support, q3mainwindow.h)
    1153 QT_CLASS_LIB(Q3PopupMenu, Qt3Support, q3popupmenu.h)
    1154 QT_CLASS_LIB(Q3ProgressBar, Qt3Support, q3progressbar.h)
    1155 QT_CLASS_LIB(Q3RangeControl, Qt3Support, q3rangecontrol.h)
    1156 QT_CLASS_LIB(Q3SpinWidget, Qt3Support, q3rangecontrol.h)
    1157 QT_CLASS_LIB(Q3ScrollView, Qt3Support, q3scrollview.h)
    1158 QT_CLASS_LIB(Q3ToolBar, Qt3Support, q3toolbar.h)
    1159 QT_CLASS_LIB(Q3VBox, Qt3Support, q3vbox.h)
    1160 QT_CLASS_LIB(Q3VGroupBox, Qt3Support, q3vgroupbox.h)
    1161 QT_CLASS_LIB(Q3WhatsThis, Qt3Support, q3whatsthis.h)
    1162 QT_CLASS_LIB(Q3WidgetStack, Qt3Support, q3widgetstack.h)
     1324QT_CLASS_LIB(Q3IconDragItem, Qt3Support, q3iconview.h)
     1325QT_CLASS_LIB(Q3IconDrag, Qt3Support, q3iconview.h)
     1326QT_CLASS_LIB(Q3IconViewItem, Qt3Support, q3iconview.h)
     1327QT_CLASS_LIB(Q3IconView, Qt3Support, q3iconview.h)
     1328QT_CLASS_LIB(Q3ListBox, Qt3Support, q3listbox.h)
     1329QT_CLASS_LIB(Q3ListBoxItem, Qt3Support, q3listbox.h)
     1330QT_CLASS_LIB(Q3ListBoxText, Qt3Support, q3listbox.h)
     1331QT_CLASS_LIB(Q3ListBoxPixmap, Qt3Support, q3listbox.h)
     1332QT_CLASS_LIB(Q3ListViewItem, Qt3Support, q3listview.h)
     1333QT_CLASS_LIB(Q3ListView, Qt3Support, q3listview.h)
     1334QT_CLASS_LIB(Q3CheckListItem, Qt3Support, q3listview.h)
     1335QT_CLASS_LIB(Q3ListViewItemIterator, Qt3Support, q3listview.h)
     1336QT_CLASS_LIB(Q3TableSelection, Qt3Support, q3table.h)
     1337QT_CLASS_LIB(Q3TableItem, Qt3Support, q3table.h)
     1338QT_CLASS_LIB(Q3ComboTableItem, Qt3Support, q3table.h)
     1339QT_CLASS_LIB(Q3CheckTableItem, Qt3Support, q3table.h)
     1340QT_CLASS_LIB(Q3Table, Qt3Support, q3table.h)
     1341QT_CLASS_LIB(Q3PaintDeviceMetrics, Qt3Support, q3paintdevicemetrics.h)
     1342QT_CLASS_LIB(Q3Painter, Qt3Support, q3painter.h)
     1343QT_CLASS_LIB(Q3Picture, Qt3Support, q3picture.h)
     1344QT_CLASS_LIB(Q3PointArray, Qt3Support, q3pointarray.h)
     1345QT_CLASS_LIB(Q3CanvasItemList, Qt3Support, q3canvas.h)
     1346QT_CLASS_LIB(Q3CanvasItem, Qt3Support, q3canvas.h)
     1347QT_CLASS_LIB(Q3Canvas, Qt3Support, q3canvas.h)
     1348QT_CLASS_LIB(Q3CanvasView, Qt3Support, q3canvas.h)
     1349QT_CLASS_LIB(Q3CanvasPixmap, Qt3Support, q3canvas.h)
     1350QT_CLASS_LIB(Q3CanvasPixmapArray, Qt3Support, q3canvas.h)
     1351QT_CLASS_LIB(Q3CanvasSprite, Qt3Support, q3canvas.h)
     1352QT_CLASS_LIB(Q3CanvasPolygonalItem, Qt3Support, q3canvas.h)
     1353QT_CLASS_LIB(Q3CanvasRectangle, Qt3Support, q3canvas.h)
     1354QT_CLASS_LIB(Q3CanvasPolygon, Qt3Support, q3canvas.h)
     1355QT_CLASS_LIB(Q3CanvasSpline, Qt3Support, q3canvas.h)
     1356QT_CLASS_LIB(Q3CanvasLine, Qt3Support, q3canvas.h)
     1357QT_CLASS_LIB(Q3CanvasEllipse, Qt3Support, q3canvas.h)
     1358QT_CLASS_LIB(Q3CanvasText, Qt3Support, q3canvas.h)

  • trunk/src/tools/uic/treewalker.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/uic/treewalker.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**

  • trunk/src/tools/uic/ui4.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**
    … …  
    23692369    delete m_properties;
    23702370    delete m_slots;
     2371    delete m_propertyspecifications;
    23712372
    23722373    if (clear_all) {
    … …  
    23822383    m_properties = 0;
    23832384    m_slots = 0;
     2385    m_propertyspecifications = 0;
    23842386}
    23852387
    … …  
    23942396    m_properties = 0;
    23952397    m_slots = 0;
     2398    m_propertyspecifications = 0;
    23962399}
    23972400
    … …  
    24042407    delete m_properties;
    24052408    delete m_slots;
     2409    delete m_propertyspecifications;
    24062410}
    24072411
    … …  
    24692473                continue;
    24702474            }
     2475            if (tag == QLatin1String("propertyspecifications")) {
     2476                DomPropertySpecifications *v = new DomPropertySpecifications();
     2477                v->read(reader);
     2478                setElementPropertyspecifications(v);
     2479                continue;
     2480            }
    24712481            reader.raiseError(QLatin1String("Unexpected element ") + tag);
    24722482        }
    … …  
    25492559                continue;
    25502560            }
     2561            if (tag == QLatin1String("propertyspecifications")) {
     2562                DomPropertySpecifications *v = new DomPropertySpecifications();
     2563                v->read(e);
     2564                setElementPropertyspecifications(v);
     2565                continue;
     2566            }
    25512567    }
    25522568    m_text.clear();
    … …  
    26062622    }
    26072623
     2624    if (m_children & Propertyspecifications) {
     2625        m_propertyspecifications->write(writer, QLatin1String("propertyspecifications"));
     2626    }
     2627
    26082628    if (!m_text.isEmpty())
    26092629        writer.writeCharacters(m_text);
    … …  
    27322752}
    27332753
     2754DomPropertySpecifications* DomCustomWidget::takeElementPropertyspecifications()
     2755{
     2756    DomPropertySpecifications* a = m_propertyspecifications;
     2757    m_propertyspecifications = 0;
     2758    m_children ^= Propertyspecifications;
     2759    return a;
     2760}
     2761
     2762void DomCustomWidget::setElementPropertyspecifications(DomPropertySpecifications* a)
     2763{
     2764    delete m_propertyspecifications;
     2765    m_children |= Propertyspecifications;
     2766    m_propertyspecifications = a;
     2767}
     2768
    27342769void DomCustomWidget::clearElementClass()
    27352770{
    … …  
    27972832    m_slots = 0;
    27982833    m_children &= ~Slots;
     2834}
     2835
     2836void DomCustomWidget::clearElementPropertyspecifications()
     2837{
     2838    delete m_propertyspecifications;
     2839    m_propertyspecifications = 0;
     2840    m_children &= ~Propertyspecifications;
    27992841}
    28002842
    … …  
    1088410926}
    1088510927
     10928void DomPropertySpecifications::clear(bool clear_all)
     10929{
     10930    qDeleteAll(m_stringpropertyspecification);
     10931    m_stringpropertyspecification.clear();
     10932
     10933    if (clear_all) {
     10934    m_text.clear();
     10935    }
     10936
     10937    m_children = 0;
     10938}
     10939
     10940DomPropertySpecifications::DomPropertySpecifications()
     10941{
     10942    m_children = 0;
     10943}
     10944
     10945DomPropertySpecifications::~DomPropertySpecifications()
     10946{
     10947    qDeleteAll(m_stringpropertyspecification);
     10948    m_stringpropertyspecification.clear();
     10949}
     10950
     10951void DomPropertySpecifications::read(QXmlStreamReader &reader)
     10952{
     10953
     10954    for (bool finished = false; !finished && !reader.hasError();) {
     10955        switch (reader.readNext()) {
     10956        case QXmlStreamReader::StartElement : {
     10957            const QString tag = reader.name().toString().toLower();
     10958            if (tag == QLatin1String("stringpropertyspecification")) {
     10959                DomStringPropertySpecification *v = new DomStringPropertySpecification();
     10960                v->read(reader);
     10961                m_stringpropertyspecification.append(v);
     10962                continue;
     10963            }
     10964            reader.raiseError(QLatin1String("Unexpected element ") + tag);
     10965        }
     10966            break;
     10967        case QXmlStreamReader::EndElement :
     10968            finished = true;
     10969            break;
     10970        case QXmlStreamReader::Characters :
     10971            if (!reader.isWhitespace())
     10972                m_text.append(reader.text().toString());
     10973            break;
     10974        default :
     10975            break;
     10976        }
     10977    }
     10978}
     10979
     10980#ifdef QUILOADER_QDOM_READ
     10981void DomPropertySpecifications::read(const QDomElement &node)
     10982{
     10983    for (QDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
     10984        if (!n.isElement())
     10985            continue;
     10986        QDomElement e = n.toElement();
     10987        QString tag = e.tagName().toLower();
     10988            if (tag == QLatin1String("stringpropertyspecification")) {
     10989                DomStringPropertySpecification *v = new DomStringPropertySpecification();
     10990                v->read(e);
     10991                m_stringpropertyspecification.append(v);
     10992                continue;
     10993            }
     10994    }
     10995    m_text.clear();
     10996    for (QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling()) {
     10997        if (child.isText())
     10998            m_text.append(child.nodeValue());
     10999     }
     11000}
     11001#endif
     11002
     11003void DomPropertySpecifications::write(QXmlStreamWriter &writer, const QString &tagName) const
     11004{
     11005    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("propertyspecifications") : tagName.toLower());
     11006
     11007    for (int i = 0; i < m_stringpropertyspecification.size(); ++i) {
     11008        DomStringPropertySpecification* v = m_stringpropertyspecification[i];
     11009        v->write(writer, QLatin1String("stringpropertyspecification"));
     11010    }
     11011    if (!m_text.isEmpty())
     11012        writer.writeCharacters(m_text);
     11013
     11014    writer.writeEndElement();
     11015}
     11016
     11017void DomPropertySpecifications::setElementStringpropertyspecification(const QList<DomStringPropertySpecification*>& a)
     11018{
     11019    m_children |= Stringpropertyspecification;
     11020    m_stringpropertyspecification = a;
     11021}
     11022
     11023void DomStringPropertySpecification::clear(bool clear_all)
     11024{
     11025
     11026    if (clear_all) {
     11027    m_text.clear();
     11028    m_has_attr_name = false;
     11029    m_has_attr_type = false;
     11030    m_has_attr_notr = false;
     11031    }
     11032
     11033    m_children = 0;
     11034}
     11035
     11036DomStringPropertySpecification::DomStringPropertySpecification()
     11037{
     11038    m_children = 0;
     11039    m_has_attr_name = false;
     11040    m_has_attr_type = false;
     11041    m_has_attr_notr = false;
     11042}
     11043
     11044DomStringPropertySpecification::~DomStringPropertySpecification()
     11045{
     11046}
     11047
     11048void DomStringPropertySpecification::read(QXmlStreamReader &reader)
     11049{
     11050
     11051    foreach (const QXmlStreamAttribute &attribute, reader.attributes()) {
     11052        QStringRef name = attribute.name();
     11053        if (name == QLatin1String("name")) {
     11054            setAttributeName(attribute.value().toString());
     11055            continue;
     11056        }
     11057        if (name == QLatin1String("type")) {
     11058            setAttributeType(attribute.value().toString());
     11059            continue;
     11060        }
     11061        if (name == QLatin1String("notr")) {
     11062            setAttributeNotr(attribute.value().toString());
     11063            continue;
     11064        }
     11065        reader.raiseError(QLatin1String("Unexpected attribute ") + name.toString());
     11066    }
     11067
     11068    for (bool finished = false; !finished && !reader.hasError();) {
     11069        switch (reader.readNext()) {
     11070        case QXmlStreamReader::StartElement : {
     11071            const QString tag = reader.name().toString().toLower();
     11072            reader.raiseError(QLatin1String("Unexpected element ") + tag);
     11073        }
     11074            break;
     11075        case QXmlStreamReader::EndElement :
     11076            finished = true;
     11077            break;
     11078        case QXmlStreamReader::Characters :
     11079            if (!reader.isWhitespace())
     11080                m_text.append(reader.text().toString());
     11081            break;
     11082        default :
     11083            break;
     11084        }
     11085    }
     11086}
     11087
     11088#ifdef QUILOADER_QDOM_READ
     11089void DomStringPropertySpecification::read(const QDomElement &node)
     11090{
     11091    if (node.hasAttribute(QLatin1String("name")))
     11092        setAttributeName(node.attribute(QLatin1String("name")));
     11093    if (node.hasAttribute(QLatin1String("type")))
     11094        setAttributeType(node.attribute(QLatin1String("type")));
     11095    if (node.hasAttribute(QLatin1String("notr")))
     11096        setAttributeNotr(node.attribute(QLatin1String("notr")));
     11097
     11098    for (QDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
     11099        if (!n.isElement())
     11100            continue;
     11101        QDomElement e = n.toElement();
     11102        QString tag = e.tagName().toLower();
     11103    }
     11104    m_text.clear();
     11105    for (QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling()) {
     11106        if (child.isText())
     11107            m_text.append(child.nodeValue());
     11108     }
     11109}
     11110#endif
     11111
     11112void DomStringPropertySpecification::write(QXmlStreamWriter &writer, const QString &tagName) const
     11113{
     11114    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("stringpropertyspecification") : tagName.toLower());
     11115
     11116    if (hasAttributeName())
     11117        writer.writeAttribute(QLatin1String("name"), attributeName());
     11118
     11119    if (hasAttributeType())
     11120        writer.writeAttribute(QLatin1String("type"), attributeType());
     11121
     11122    if (hasAttributeNotr())
     11123        writer.writeAttribute(QLatin1String("notr"), attributeNotr());
     11124
     11125    if (!m_text.isEmpty())
     11126        writer.writeCharacters(m_text);
     11127
     11128    writer.writeEndElement();
     11129}
     11130
    1088611131QT_END_NAMESPACE
    1088711132

  • trunk/src/tools/uic/ui4.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**
    … …  
    162162class DomDesignerData;
    163163class DomSlots;
     164class DomPropertySpecifications;
     165class DomStringPropertySpecification;
    164166
    165167/*******************************************************************************
    … …  
    10161018    void clearElementSlots();
    10171019
     1020    inline DomPropertySpecifications* elementPropertyspecifications() const { return m_propertyspecifications; }
     1021    DomPropertySpecifications* takeElementPropertyspecifications();
     1022    void setElementPropertyspecifications(DomPropertySpecifications* a);
     1023    inline bool hasElementPropertyspecifications() const { return m_children & Propertyspecifications; }
     1024    void clearElementPropertyspecifications();
     1025
    10181026private:
    10191027    QString m_text;
    … …  
    10341042    DomProperties* m_properties;
    10351043    DomSlots* m_slots;
     1044    DomPropertySpecifications* m_propertyspecifications;
    10361045    enum Child {
    10371046        Class = 1,
    … …  
    10451054        Script = 256,
    10461055        Properties = 512,
    1047         Slots = 1024
     1056        Slots = 1024,
     1057        Propertyspecifications = 2048
    10481058    };
    10491059
    … …  
    36873697};
    36883698
     3699class QDESIGNER_UILIB_EXPORT DomPropertySpecifications {
     3700public:
     3701    DomPropertySpecifications();
     3702    ~DomPropertySpecifications();
     3703
     3704    void read(QXmlStreamReader &reader);
     3705#ifdef QUILOADER_QDOM_READ
     3706    void read(const QDomElement &node);
     3707#endif
     3708    void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const;
     3709    inline QString text() const { return m_text; }
     3710    inline void setText(const QString &s) { m_text = s; }
     3711
     3712    // attribute accessors
     3713    // child element accessors
     3714    inline QList<DomStringPropertySpecification*> elementStringpropertyspecification() const { return m_stringpropertyspecification; }
     3715    void setElementStringpropertyspecification(const QList<DomStringPropertySpecification*>& a);
     3716
     3717private:
     3718    QString m_text;
     3719    void clear(bool clear_all = true);
     3720
     3721    // attribute data
     3722    // child element data
     3723    uint m_children;
     3724    QList<DomStringPropertySpecification*> m_stringpropertyspecification;
     3725    enum Child {
     3726        Stringpropertyspecification = 1
     3727    };
     3728
     3729    DomPropertySpecifications(const DomPropertySpecifications &other);
     3730    void operator = (const DomPropertySpecifications&other);
     3731};
     3732
     3733class QDESIGNER_UILIB_EXPORT DomStringPropertySpecification {
     3734public:
     3735    DomStringPropertySpecification();
     3736    ~DomStringPropertySpecification();
     3737
     3738    void read(QXmlStreamReader &reader);
     3739#ifdef QUILOADER_QDOM_READ
     3740    void read(const QDomElement &node);
     3741#endif
     3742    void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const;
     3743    inline QString text() const { return m_text; }
     3744    inline void setText(const QString &s) { m_text = s; }
     3745
     3746    // attribute accessors
     3747    inline bool hasAttributeName() const { return m_has_attr_name; }
     3748    inline QString attributeName() const { return m_attr_name; }
     3749    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
     3750    inline void clearAttributeName() { m_has_attr_name = false; }
     3751
     3752    inline bool hasAttributeType() const { return m_has_attr_type; }
     3753    inline QString attributeType() const { return m_attr_type; }
     3754    inline void setAttributeType(const QString& a) { m_attr_type = a; m_has_attr_type = true; }
     3755    inline void clearAttributeType() { m_has_attr_type = false; }
     3756
     3757    inline bool hasAttributeNotr() const { return m_has_attr_notr; }
     3758    inline QString attributeNotr() const { return m_attr_notr; }
     3759    inline void setAttributeNotr(const QString& a) { m_attr_notr = a; m_has_attr_notr = true; }
     3760    inline void clearAttributeNotr() { m_has_attr_notr = false; }
     3761
     3762    // child element accessors
     3763private:
     3764    QString m_text;
     3765    void clear(bool clear_all = true);
     3766
     3767    // attribute data
     3768    QString m_attr_name;
     3769    bool m_has_attr_name;
     3770
     3771    QString m_attr_type;
     3772    bool m_has_attr_type;
     3773
     3774    QString m_attr_notr;
     3775    bool m_has_attr_notr;
     3776
     3777    // child element data
     3778    uint m_children;
     3779
     3780    DomStringPropertySpecification(const DomStringPropertySpecification &other);
     3781    void operator = (const DomStringPropertySpecification&other);
     3782};
     3783
    36893784
    36903785#ifdef QFORMINTERNAL_NAMESPACE

  • trunk/src/tools/uic/uic.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**
    … …  
    138138
    139139        out << "/********************************************************************************\n";
    140         out << "** Form generated from reading ui file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
     140        out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
    141141        out << "**\n";
    142142        out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
    143143        out << "**      " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
    144144        out << "**\n";
    145         out << "** WARNING! All changes made in this file will be lost when recompiling ui file!\n";
     145        out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n";
    146146        out << "********************************************************************************/\n\n";
    147147}
    … …  
    185185        delete ui;
    186186        ui = 0;
    187         fprintf(stderr, "uic: Error in line %llu, column %llu : %s\n",
    188                 reader.lineNumber(), reader.columnNumber(),
    189                 reader.errorString().toAscii().constData());
     187        fprintf(stderr, "%s\n", qPrintable(QString::fromLatin1("uic: Error in line %1, column %2 : %3")
     188                                    .arg(reader.lineNumber()).arg(reader.columnNumber())
     189                                    .arg(reader.errorString())));
    190190    }
    191191
    … …  
    364364}
    365365
     366bool Uic::isCustomWidgetContainer(const QString &className) const
     367{
     368    return customWidgetsInfo()->isCustomWidgetContainer(className);
     369}
     370
    366371bool Uic::isStatusBar(const QString &className) const
    367372{

  • trunk/src/tools/uic/uic.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**
    … …  
    116116    bool isButton(const QString &className) const;
    117117    bool isContainer(const QString &className) const;
     118    bool isCustomWidgetContainer(const QString &className) const;
    118119    bool isMenuBar(const QString &className) const;
    119120    bool isMenu(const QString &className) const;

  • trunk/src/tools/uic/utils.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**

  • trunk/src/tools/uic/validator.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/uic/validator.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**

  • trunk/src/tools/uic3/converter.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**
    … …  
    989989
    990990    bool wordWrapFound = false;
     991    bool wordWrapPropertyFound = false;
    991992
    992993    for (QDomElement e=n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) {
    … …  
    11001101            name = prop->attributeName(); // sync the name
    11011102
    1102             if (className == QLatin1String("QLabel") && name == QLatin1String("alignment")) {
    1103                 QString v = prop->elementSet();
    1104 
    1105                 if (v.contains(QRegExp(QLatin1String("\\bWordBreak\\b"))))
    1106                     wordWrapFound = true;
    1107             }
    1108 
     1103            if (className == QLatin1String("QLabel")) {
     1104                if (name == QLatin1String("alignment")) {
     1105                    const QString v = prop->elementSet();
     1106                    if (v.contains(QRegExp(QLatin1String("\\bWordBreak\\b"))))
     1107                        wordWrapFound = true;
     1108                } else if (name == QLatin1String("wordWrap")) {
     1109                    wordWrapPropertyFound = true;
     1110                }
     1111            }
    11091112
    11101113            // resolve the flags and enumerator
    … …  
    11651168        }
    11661169    }
    1167     if (className == QLatin1String("QLabel")) {
     1170    if (className == QLatin1String("QLabel") && !wordWrapPropertyFound) {
    11681171        DomProperty *wordWrap = new DomProperty();
    11691172        wordWrap->setAttributeName(QLatin1String("wordWrap"));

  • trunk/src/tools/uic3/deps.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/uic3/domtool.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/uic3/domtool.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**

  • trunk/src/tools/uic3/embed.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**
    … …  
    178178        e->height = img.height();
    179179        e->depth = img.depth();
    180         e->numColors = img.numColors();
     180        e->numColors = img.colorCount();
    181181        e->colorTable = new QRgb[e->numColors];
    182182        e->alpha = img.hasAlphaBuffer();
    … …  
    196196        e->compressed =
    197197#endif
    198             embedData( out, img.bits(), img.numBytes() );
     198            embedData( out, img.bits(), img.byteCount() );
    199199        out << "\n};\n\n";
    200200        if ( e->numColors ) {
    … …  
    239239            else
    240240                out << "false, ";
    241             out << "\"" << e->name << "\" },\n";
     241            out << '\"' << e->name << "\" },\n";
    242242            delete e;
    243243        }

  • trunk/src/tools/uic3/form.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**
    … …  
    186186        if (!(*it).isEmpty()) {
    187187            QString header = fixHeaderName(*it);
    188             out << "#include <" << header << ">" << endl;
     188            out << "#include <" << header << '>' << endl;
    189189        }
    190190    }
    … …  
    193193        if (!(*it).isEmpty()) {
    194194            QString header = fixHeaderName(*it);
    195             out << "#include \"" << header << "\"" << endl;
     195            out << "#include \"" << header << '\"' << endl;
    196196        }
    197197    }
    … …  
    217217    for (it = typeDefs.constBegin(); it != typeDefs.constEnd(); ++it) {
    218218        if (!(*it).isEmpty())
    219             out << "typedef " << *it << ";" << endl;
     219            out << "typedef " << *it << ';' << endl;
    220220    }
    221221
    … …  
    237237                ++ns;
    238238            }
    239             out << "class " << forwardName << ";" << endl;
     239            out << "class " << forwardName << ';' << endl;
    240240            for (int i = 0; i < (int) forwardNamespaces.count(); i++)
    241                 out << "}" << endl;
     241                out << '}' << endl;
    242242        }
    243243    }
    … …  
    246246        QString fd = *it;
    247247        fd = fd.trimmed();
    248         if (!fd.endsWith(QLatin1String(";")))
    249             fd += QLatin1String(";");
     248        if (!fd.endsWith(QLatin1Char(';')))
     249            fd += QLatin1Char(';');
    250250        out << fd << endl;
    251251    }
    … …  
    280280    out << "#define " << protector << endl;
    281281    out << endl;
    282     out << "#include \"" << convertedUiFile << "\"" << endl;
     282    out << "#include \"" << convertedUiFile << '\"' << endl;
    283283
    284284    createWrapperDeclContents(e);
    … …  
    310310    out << "class ";
    311311    if (!exportMacro.isEmpty())
    312         out << exportMacro << " ";
    313     out << bareNameOfClass << " : public " << objClass << ", public Ui::" << bareNameOfClass << endl << "{" << endl;
     312        out << exportMacro << ' ';
     313    out << bareNameOfClass << " : public " << objClass << ", public Ui::" << bareNameOfClass << endl << '{' << endl;
    314314
    315315    /* qmake ignore Q_OBJECT */
    … …  
    363363        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    364364        QString functionName = n.firstChild().toText().data().trimmed();
    365         if (functionName.endsWith(QLatin1String(";")))
    366             functionName = functionName.left(functionName.length() - 1);
     365        if (functionName.endsWith(QLatin1Char(';')))
     366            functionName.chop(1);
    367367        QString specifier = n.attribute(QLatin1String("specifier"));
    368368        QString access = n.attribute(QLatin1String("access"));
    … …  
    395395        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    396396        QString functionName = n.firstChild().toText().data().trimmed();
    397         if (functionName.endsWith(QLatin1String(";")))
    398             functionName = functionName.left(functionName.length() - 1);
     397        if (functionName.endsWith(QLatin1Char(';')))
     398            functionName.chop(1);
    399399        QString specifier = n.attribute(QLatin1String("specifier"));
    400400        QString access = n.attribute(QLatin1String("access"));
    … …  
    424424        QString access = n.attribute(QLatin1String("access"), QLatin1String("protected"));
    425425        QString var = fixDeclaration(n.firstChild().toText().data().trimmed());
    426         if (!var.endsWith(QLatin1String(";")))
    427             var += QLatin1String(";");
     426        if (!var.endsWith(QLatin1Char(';')))
     427            var += QLatin1Char(';');
    428428        if (access == QLatin1String("public"))
    429429            publicVars += var;
    … …  
    459459            continue;
    460460        QString sigName = n.firstChild().toText().data().trimmed();
    461         if (sigName.endsWith(QLatin1String(";")))
     461        if (sigName.endsWith(QLatin1Char(';')))
    462462            sigName = sigName.left(sigName.length() - 1);
    463463        extraSignals += fixDeclaration(sigName);
    … …  
    468468        out << "signals:" << endl;
    469469        for (it = extraSignals.constBegin(); it != extraSignals.constEnd(); ++it)
    470             out << "    void " << (*it) << ";" << endl;
     470            out << "    void " << (*it) << ';' << endl;
    471471        out << endl;
    472472    }
    … …  
    514514    out << "};" << endl;
    515515    for (i = 0; i < (int) namespaces.count(); i++)
    516         out << "}" << endl;
     516        out << '}' << endl;
    517517
    518518    out << endl;
    … …  
    544544        signature = fixDeclaration(signature);
    545545        type = fixType(type);
    546         out << "    " << specifier << type << " " << signature << pure << ";" << endl;
     546        out << "    " << specifier << type << ' ' << signature << pure << ';' << endl;
    547547    }
    548548    out << endl;
    … …  
    584584            continue;
    585585        QString functionName = n.firstChild().toText().data().trimmed();
    586         if (functionName.endsWith(QLatin1String(";")))
    587             functionName = functionName.left(functionName.length() - 1);
     586        if (functionName.endsWith(QLatin1Char(';')))
     587            functionName.chop(1);
    588588        extraFuncts += functionName;
    589589        extraFunctTyp += n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    … …  
    599599            continue;
    600600        QString functionName = n.firstChild().toText().data().trimmed();
    601         if (functionName.endsWith(QLatin1String(";")))
    602             functionName = functionName.left(functionName.length() - 1);
     601        if (functionName.endsWith(QLatin1Char(';')))
     602            functionName.chop(1);
    603603        extraFuncts += functionName;
    604604        extraFunctTyp += n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    … …  
    664664    for (it = globalIncludes.begin(); it != globalIncludes.end(); ++it) {
    665665        if (!(*it).isEmpty())
    666             out << "#include <" << fixHeaderName(*it) << ">" << endl;
     666            out << "#include <" << fixHeaderName(*it) << '>' << endl;
    667667    }
    668668
    … …  
    678678    for (it = localIncludes.begin(); it != localIncludes.end(); ++it) {
    679679        if (!(*it).isEmpty() && *it != QFileInfo(fileName + QLatin1String(".h")).fileName())
    680             out << "#include \"" << fixHeaderName(*it) << "\"" << endl;
     680            out << "#include \"" << fixHeaderName(*it) << '\"' << endl;
    681681    }
    682682
    … …  
    685685        if (!outputFileName.isEmpty())
    686686            uiDotH = QString::fromUtf8(combinePath(uiDotH.ascii(), outputFileName.ascii()));
    687         out << "#include \"" << uiDotH << "\"" << endl;
     687        out << "#include \"" << uiDotH << '\"' << endl;
    688688        writeFunctImpl = false;
    689689    }
    … …  
    703703        out << " *" << endl;
    704704        out << " *  The " << objClass.mid(1).toLower() << " will by default be modeless, unless you set 'modal' to" << endl;
    705         out << " *  true to construct a modal " << objClass.mid(1).toLower() << "." << endl;
     705        out << " *  true to construct a modal " << objClass.mid(1).toLower() << '.' << endl;
    706706        out << " */" << endl;
    707707        out << nameOfClass << "::" << bareNameOfClass << "(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)" << endl;
    … …  
    734734    out << endl;
    735735
    736     out << "{" << endl;
     736    out << '{' << endl;
    737737
    738738//
    … …  
    776776
    777777    // end of constructor
    778     out << "}" << endl;
     778    out << '}' << endl;
    779779    out << endl;
    780780
    … …  
    784784    out << " */" << endl;
    785785    out << nameOfClass << "::~" << bareNameOfClass << "()" << endl;
    786     out << "{" << endl;
     786    out << '{' << endl;
    787787    if (extraFuncts.contains(QLatin1String("destroy()")))
    788788        out << indent << "destroy();" << endl;
    789789    out << indent << "// no need to delete child widgets, Qt does it all for us" << endl;
    790     out << "}" << endl;
     790    out << '}' << endl;
    791791    out << endl;
    792792
    … …  
    817817    out << " */" << endl;
    818818    out << "void " << nameOfClass << "::languageChange()" << endl;
    819     out << "{" << endl;
     819    out << '{' << endl;
    820820    out << "    retranslateUi(this);" << endl;
    821     out << "}" << endl;
     821    out << '}' << endl;
    822822    out << endl;
    823823
    … …  
    834834            QString fname = fixDeclaration(Parser::cleanArgs(*it));
    835835            if (!(*it3).startsWith(QLatin1String("pure"))) { // "pure virtual" or "pureVirtual"
    836                 out << type << " " << nameOfClass << "::" << fname << endl;
    837                 out << "{" << endl;
     836                out << type << ' ' << nameOfClass << "::" << fname << endl;
     837                out << '{' << endl;
    838838                if (*it != QLatin1String("init()") && *it != QLatin1String("destroy()")) {
    839839                    QRegExp numeric(QLatin1String("^(?:signed|unsigned|u?char|u?short|u?int"
    … …  
    869869                        if (type == QLatin1String("bool")) {
    870870                            retVal = QLatin1String("false");
    871                         } else if (isBasicNumericType || type.endsWith(QLatin1String("*"))) {
     871                        } else if (isBasicNumericType || type.endsWith(QLatin1Char('*'))) {
    872872                            retVal = QLatin1String("0");
    873                         } else if (type.endsWith(QLatin1String("&"))) {
     873                        } else if (type.endsWith(QLatin1Char('&'))) {
    874874                            do {
    875875                                type.chop(1);
    876                             } while (type.endsWith(QLatin1String(" ")));
     876                            } while (type.endsWith(QLatin1Char(' ')));
    877877                            retVal = QLatin1String("uic_temp_var");
    878                             out << indent << "static " << type << " " << retVal << ";" << endl;
     878                            out << indent << "static " << type << ' ' << retVal << ';' << endl;
    879879                        } else {
    880880                            retVal = type + QLatin1String("()");
    … …  
    884884                    out << indent << "qWarning(\"" << nameOfClass << "::" << fname << ": Not implemented yet\");" << endl;
    885885                    if (!retVal.isEmpty())
    886                         out << indent << "return " << retVal << ";" << endl;
     886                        out << indent << "return " << retVal << ';' << endl;
    887887                }
    888                 out << "}" << endl;
     888                out << '}' << endl;
    889889                out << endl;
    890890            }

  • trunk/src/tools/uic3/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**
    … …  
    115115                if (opt == "wrap" || opt[1] == '\0') {
    116116                    if (!(n < argc-1)) {
    117                         error = "Missing name of converted ui file";
     117                        error = "Missing name of converted UI file";
    118118                        break;
    119119                    }
    … …  
    231231                 "\t<uiheaderfile>  name of the data file\n"
    232232                 "   %s  [options] -wrap <converteduifile> <uifile>\n"
    233                  "\t<converteduifile>  name of the converted ui file\n"
     233                 "\t<converteduifile>  name of the converted UI file\n"
    234234                 "Generate implementation:\n"
    235235                 "   %s  [options] -impl <headerfile> <uifile>\n"
    … …  
    255255                 "\t-nofwd             Omit forward declarations of custom classes\n"
    256256                 "\t-no-implicit-includes Do not generate #include-directives for custom classes\n"
    257                  "\t-nounload          Don't unload plugins after processing\n"
     257                 "\t-nounload          Do not unload plugins after processing\n"
    258258                 "\t-tr func           Use func() instead of tr() for i18n\n"
    259259                 "\t-L path            Additional plugin search path\n"
    … …  
    368368
    369369    if (headerFile) {
    370         out << "#include \"" << headerFile << "\"" << endl << endl;
     370        out << "#include \"" << headerFile << '\"' << endl << endl;
    371371    }
    372372

  • trunk/src/tools/uic3/object.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/uic3/parser.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**
    … …  
    4949{
    5050    QString slot(func);
    51     int begin = slot.indexOf(QLatin1String("(")) + 1;
     51    int begin = slot.indexOf(QLatin1Char('(')) + 1;
    5252    QString args = slot.mid(begin);
    53     args = args.left(args.indexOf(QLatin1String(")")));
     53    args = args.left(args.indexOf(QLatin1Char(')')));
    5454    QStringList lst = args.split(QLatin1Char(','));
    5555    QString res = slot.left(begin);
    5656    for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it) {
    5757        if (it != lst.begin())
    58             res += QLatin1String(",");
     58            res += QLatin1Char(',');
    5959        QString arg = *it;
    6060        int pos = 0;
    … …  
    6666            arg = arg.simplified();
    6767            if ((pos = arg.indexOf(QLatin1Char(':'))) != -1)
    68                 arg = arg.left(pos).simplified() + QLatin1String(":") + arg.mid(pos + 1).simplified();
     68                arg = arg.left(pos).simplified() + QLatin1Char(':') + arg.mid(pos + 1).simplified();
    6969            QStringList l = arg.split(QLatin1Char(' '));
    7070            if (l.count() == 2) {
    … …  
    7474                    arg = l[0];
    7575            } else if (l.count() == 3) {
    76                 arg = l[0] + QLatin1String(" ") + l[1];
     76                arg = l[0] + QLatin1Char(' ') + l[1];
    7777            }
    7878        }
    7979        res += arg;
    8080    }
    81     res += QLatin1String(")");
     81    res += QLatin1Char(')');
    8282    return res;
    8383}

  • trunk/src/tools/uic3/parser.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**

  • trunk/src/tools/uic3/qt3to4.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**
    … …  
    150150    QString filePath;
    151151    //check QLibraryInfo::DataPath/filename
    152     filePath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::DataPath) + QLatin1String("/") + fileName)  ;
     152    filePath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::DataPath) + QLatin1Char('/') + fileName)  ;
    153153
    154154    //check QLibraryInfo::PrefixPath/tools/porting/src/filename

  • trunk/src/tools/uic3/qt3to4.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**

  • trunk/src/tools/uic3/subclassing.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**
    … …  
    7070
    7171    out << "class " << subClass << " : public " << nameOfClass << endl;
    72     out << "{" << endl;
     72    out << '{' << endl;
    7373
    7474/* tmake ignore Q_OBJECT */
    … …  
    106106        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    107107        QString functionName = n.firstChild().toText().data().trimmed();
    108         if ( functionName.endsWith(QLatin1String(";")))
    109             functionName = functionName.left( functionName.length() - 1 );
     108        if ( functionName.endsWith(QLatin1Char(';')))
     109            functionName.chop(1);
    110110        QString specifier = n.attribute(QLatin1String("specifier"));
    111111        QString access = n.attribute(QLatin1String("access"));
    … …  
    134134        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    135135        QString functionName = n.firstChild().toText().data().trimmed();
    136         if ( functionName.endsWith(QLatin1String(";")) )
    137             functionName = functionName.left( functionName.length() - 1 );
     136        if ( functionName.endsWith(QLatin1Char(';')) )
     137            functionName.chop(1);
    138138        QString specifier = n.attribute(QLatin1String("specifier"));
    139139        QString access = n.attribute(QLatin1String("access"));
    … …  
    196196        if ( *it3 == QLatin1String("non virtual") )
    197197            continue;
    198         out << "    " << type << " " << fixDeclaration(*it) << ";" << endl;
     198        out << "    " << type << ' ' << fixDeclaration(*it) << ';' << endl;
    199199    }
    200200    out << endl;
    … …  
    224224        out << " *" << endl;
    225225        out << " *  The " << objClass.mid(1).toLower() << " will by default be modeless, unless you set 'modal' to" << endl;
    226         out << " *  true to construct a modal " << objClass.mid(1).toLower() << "." << endl;
     226        out << " *  true to construct a modal " << objClass.mid(1).toLower() << '.' << endl;
    227227        out << " */" << endl;
    228228        out << subClass << "::" << subClass << "( QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl )" << endl;
    … …  
    236236        out << "    : " << nameOfClass << "( parent, name, fl )" << endl;
    237237    }
    238     out << "{" << endl;
    239     out << "}" << endl;
     238    out << '{' << endl;
     239    out << '}' << endl;
    240240    out << endl;
    241241
    … …  
    245245    out << " */" << endl;
    246246    out << subClass << "::~" << subClass << "()" << endl;
    247     out << "{" << endl;
     247    out << '{' << endl;
    248248    out << "    // no need to delete child widgets, Qt does it all for us" << endl;
    249     out << "}" << endl;
     249    out << '}' << endl;
    250250    out << endl;
    251251
    … …  
    269269        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    270270        QString functionName = n.firstChild().toText().data().trimmed();
    271         if ( functionName.endsWith(QLatin1String(";")) )
    272             functionName = functionName.left( functionName.length() - 1 );
     271        if ( functionName.endsWith(QLatin1Char(';')) )
     272            functionName.chop(1);
    273273        QString specifier = n.attribute(QLatin1String("specifier"));
    274274        QString access = n.attribute(QLatin1String("access"));
    … …  
    297297        QString returnType = n.attribute(QLatin1String("returnType"), QLatin1String("void"));
    298298        QString functionName = n.firstChild().toText().data().trimmed();
    299         if ( functionName.endsWith(QLatin1String(";")) )
    300             functionName = functionName.left( functionName.length() - 1 );
     299        if ( functionName.endsWith(QLatin1Char(';')) )
     300            functionName.chop(1);
    301301        QString specifier = n.attribute(QLatin1String("specifier"));
    302302        QString access = n.attribute(QLatin1String("access"));
    … …  
    352352        out << " * " << descr << endl;
    353353        out << " */" << endl;
    354         out << type << " " << subClass << "::" << fixDeclaration(*it) << endl;
    355         out << "{" << endl;
     354        out << type << ' ' << subClass << "::" << fixDeclaration(*it) << endl;
     355        out << '{' << endl;
    356356        out << "    qWarning( \"" << subClass << "::" << fixDeclaration(*it) << " not yet implemented!\" );" << endl;
    357         out << "}" << endl << endl;
     357        out << '}' << endl << endl;
    358358    }
    359359    out << endl;

  • trunk/src/tools/uic3/ui3reader.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**
    … …  
    126126    if (!encode) {
    127127        s = str;
    128         s.replace(QLatin1String("\\"), QLatin1String("\\\\"));
    129         s.replace(QLatin1String("\""), QLatin1String("\\\""));
    130         s.replace(QLatin1String("\r"), QLatin1String(""));
    131         s.replace(QLatin1String("\n"), QLatin1String("\\n\"\n\""));
     128        s.replace(QLatin1Char('\\'), QLatin1String("\\\\"));
     129        s.replace(QLatin1Char('\"'), QLatin1String("\\\""));
     130        s.remove(QLatin1Char('\r'));
     131        s.replace(QLatin1Char('\n'), QLatin1String("\\n\"\n\""));
    132132    } else {
    133133        QByteArray utf8 = str.utf8();
    … …  
    137137    }
    138138
    139     return QLatin1String("\"") + s + QLatin1String("\"");
     139    return QLatin1Char('\"') + s + QLatin1Char('\"');
    140140}
    141141
    … …  
    159159
    160160    if (comment.isEmpty()) {
    161         return t + QLatin1String("(") + fixString(sourceText, encode) + QLatin1String(")");
     161        return t + QLatin1Char('(') + fixString(sourceText, encode) + QLatin1Char(')');
    162162    } else {
    163         return t + QLatin1String("(")
     163        return t + QLatin1Char('(')
    164164            + fixString(sourceText, encode)
    165165            + QLatin1String(", ")
    166             + fixString(comment, encode) + QLatin1String(")");
     166            + fixString(comment, encode) + QLatin1Char(')');
    167167    }
    168168}
    … …  
    481481            if (!pixmapLoaderFunction.isEmpty()) {
    482482                pixmap.prepend(pixmapLoaderFunction
    483                     + QLatin1String("(")
     483                    + QLatin1Char('(')
    484484                    + QLatin1String(externPixmaps ? "\"" : ""));
    485485
    486                 pixmap.append(QLatin1String(externPixmaps ? "\"" : "") + QLatin1String(")"));
     486                pixmap.append(QLatin1String(externPixmaps ? "\"" : "") + QLatin1Char(')'));
    487487            }
    488488            out << indent << name << ".setBrush(QColorGroup::"
    … …  
    579579    if (objectNames.contains(result)) {
    580580        int i = 2;
    581         while (objectNames.contains(result + QLatin1String("_") + QString::number(i)))
     581        while (objectNames.contains(result + QLatin1Char('_') + QString::number(i)))
    582582            i++;
    583         result += QLatin1String("_");
     583        result += QLatin1Char('_');
    584584        result += QString::number(i);
    585585    }

  • trunk/src/tools/uic3/ui3reader.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**

  • trunk/src/tools/uic3/uic.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**
    … …  
    145145
    146146        out << "/********************************************************************************\n";
    147         out << "** Form generated from reading ui file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
     147        out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
    148148        out << "**\n";
    149149        out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
    150150        out << "**      " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
    151151        out << "**\n";
    152         out << "** WARNING! All changes made in this file will be lost when recompiling ui file!\n";
     152        out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n";
    153153        out << "********************************************************************************/\n\n";
    154154}
    … …  
    323323}
    324324
     325bool Uic::isCustomWidgetContainer(const QString &className) const
     326{
     327    return customWidgetsInfo()->isCustomWidgetContainer(className);
     328}
     329
    325330bool Uic::isStatusBar(const QString &className) const
    326331{

  • trunk/src/tools/uic3/uic.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**
    … …  
    115115    bool isButton(const QString &className) const;
    116116    bool isContainer(const QString &className) const;
     117    bool isCustomWidgetContainer(const QString &className) const;
    117118    bool isMenuBar(const QString &className) const;
    118119    bool isMenu(const QString &className) const;

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