Changeset 846 for trunk/src/tools


Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
82 edited

Legend:

Unmodified
Added
Removed

  • trunk

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

    r561 r846  
    4343    contains(CONFIG, debug_and_release_target) {
    4444        CONFIG(debug, debug|release) {
    45             LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/debug
     45            QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/debug
    4646        } else {
    47             LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/release
     47            QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/release
    4848        }
    4949    } else {
    50         LIBS += -L$$QT_BUILD_TREE/src/tools/bootstrap
     50        QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap
    5151    }
    5252    LIBS += -lbootstrap
    5353}
    54 !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) {
    55    unix:LIBS += -lz
    56 #  win32:LIBS += libz.lib
     54!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile {
     55    symbian:LIBS_PRIVATE += -llibz
     56    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
     57    else:LIBS += zdll.lib
    5758}
    5859win32:LIBS += -luser32
    … …  
    6364}
    6465
     66# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working.
     67sis_target.target = sis
     68sis_target.commands =
     69sis_target.depends = first
     70QMAKE_EXTRA_TARGETS += sis_target
     71freeze_target.target = freeze
     72freeze_target.commands =
     73freeze_target.depends = first
     74QMAKE_EXTRA_TARGETS += freeze_target

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

    r561 r846  
    8888
    8989win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \
    90                  ../../corelib/io/qfsfileengine_iterator_win.cpp
     90                 ../../corelib/io/qfsfileengine_iterator_win.cpp \
     91                 ../../corelib/plugin/qsystemlibrary.cpp \
    9192
    9293os2:SOURCES += ../../corelib/io/qfsfileengine_os2.cpp \
    … …  
    99100}
    100101
    101 contains(QT_CONFIG, zlib) {
    102    INCLUDEPATH += ../../3rdparty/zlib
    103    SOURCES+= \
    104         ../3rdparty/zlib/adler32.c \
    105         ../3rdparty/zlib/compress.c \
    106         ../3rdparty/zlib/crc32.c \
    107         ../3rdparty/zlib/deflate.c \
    108         ../3rdparty/zlib/gzio.c \
    109         ../3rdparty/zlib/inffast.c \
    110         ../3rdparty/zlib/inflate.c \
    111         ../3rdparty/zlib/inftrees.c \
    112         ../3rdparty/zlib/trees.c \
    113         ../3rdparty/zlib/uncompr.c \
    114         ../3rdparty/zlib/zutil.c
    115 }
     102if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
     103else:include(../../3rdparty/zlib_dependency.pri)
    116104
    117105lib.CONFIG = dummy_install
    118106INSTALLS += lib
     107
     108# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working.
     109sis_target.target = sis
     110sis_target.commands =
     111sis_target.depends = first
     112QMAKE_EXTRA_TARGETS += sis_target
     113freeze_target.target = freeze
     114freeze_target.commands =
     115freeze_target.depends = first
     116QMAKE_EXTRA_TARGETS += freeze_target

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/generator.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    174174    fprintf(out, "static const uint qt_meta_data_%s[] = {\n", qualifiedClassNameIdentifier.constData());
    175175    fprintf(out, "\n // content:\n");
    176     fprintf(out, "    %4d,       // revision\n", 4);
     176    fprintf(out, "    %4d,       // revision\n", 5);
    177177    fprintf(out, "    %4d,       // classname\n", strreg(cdef->qualified));
    178178    fprintf(out, "    %4d, %4d, // classinfo\n", cdef->classInfoList.count(), cdef->classInfoList.count() ? index : 0);
    … …  
    483483void Generator::generateProperties()
    484484{
    485     //
    486     // specify get function, for compatibiliy we accept functions
    487     // returning pointers, or const char * for QByteArray.
    488     //
    489     for (int i = 0; i < cdef->propertyList.count(); ++i) {
    490         PropertyDef &p = cdef->propertyList[i];
    491         if (p.read.isEmpty())
    492             continue;
    493         for (int j = 0; j < cdef->publicList.count(); ++j) {
    494             const FunctionDef &f = cdef->publicList.at(j);
    495             if (f.name != p.read)
    496                 continue;
    497             if (!f.isConst) // get  functions must be const
    498                 continue;
    499             if (f.arguments.size()) // and must not take any arguments
    500                 continue;
    501             PropertyDef::Specification spec = PropertyDef::ValueSpec;
    502             QByteArray tmp = f.normalizedType;
    503             if (p.type == "QByteArray" && tmp == "const char *")
    504                     tmp = "QByteArray";
    505             if (tmp.left(6) == "const ")
    506                 tmp = tmp.mid(6);
    507             if (p.type != tmp && tmp.endsWith('*')) {
    508                 tmp.chop(1);
    509                 spec = PropertyDef::PointerSpec;
    510             } else if (f.type.name.endsWith('&')) { // raw type, not normalized type
    511                 spec = PropertyDef::ReferenceSpec;
    512             }
    513             if (p.type != tmp)
    514                 continue;
    515             p.gspec = spec;
    516             break;
    517         }
    518         if(!p.notify.isEmpty()) {
    519             int notifyId = -1;
    520             for (int j = 0; j < cdef->signalList.count(); ++j) {
    521                 const FunctionDef &f = cdef->signalList.at(j);
    522                 if(f.name != p.notify) {
    523                     continue;
    524                 } else {
    525                     notifyId = j /* Signal indexes start from 0 */;
    526                     break;
    527                 }
    528             }
    529             p.notifyId = notifyId;
    530         }
    531     }
    532 
    533485    //
    534486    // Create meta data

  • trunk/src/tools/moc/generator.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/keywords.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    362362
    363363    if (autoInclude) {
     364        int spos = filename.lastIndexOf(QDir::separator().toLatin1());
    364365        int ppos = filename.lastIndexOf('.');
    365         moc.noInclude = (ppos >= 0
    366                          && tolower(filename[ppos + 1]) != 'h'
    367                          && tolower(filename[ppos + 1]) != QDir::separator().toLatin1()
    368                         );
     366        // spos >= -1 && ppos > spos => ppos >= 0
     367        moc.noInclude = (ppos > spos && tolower(filename[ppos + 1]) != 'h');
    369368    }
    370369    if (moc.includeFiles.isEmpty()) {

  • trunk/src/tools/moc/moc.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    231231    }
    232232    while (test(CONST) || test(VOLATILE) || test(SIGNED) || test(UNSIGNED)
    233            || test(STAR) || test(AND)) {
     233           || test(STAR) || test(AND) || test(ANDAND)) {
    234234        type.name += ' ';
    235235        type.name += lexem();
    236236        if (lookup(0) == AND)
    237237            type.referenceType = Type::Reference;
     238        else if (lookup(0) == ANDAND)
     239            type.referenceType = Type::RValueReference;
    238240        else if (lookup(0) == STAR)
    239241            type.referenceType = Type::Pointer;
    … …  
    726728
    727729            checkSuperClasses(&def);
     730            checkProperties(&def);
    728731
    729732            classList += def;
    … …  
    12071210        }
    12081211    }
     1212
     1213    //when searching commas within the default argument, we should take care of template depth (anglecount)
     1214    // unfortunatelly, we do not have enough semantic information to know if '<' is the operator< or
     1215    // the beginning of a template type. so we just use heuristics.
     1216    int possible = -1;
     1217
    12091218    while (index < symbols.size()) {
    12101219        Token t = symbols.at(index++).token;
    … …  
    12251234            && brackCount <= 0
    12261235            && parenCount <= 0
    1227             && (target != RANGLE || angleCount <= 0))
     1236            && (target != RANGLE || angleCount <= 0)) {
     1237            if (target != COMMA || angleCount <= 0)
     1238                return true;
     1239            possible = index;
     1240        }
     1241
     1242        if (target == COMMA && t == EQ && possible != -1) {
     1243            index = possible;
    12281244            return true;
     1245        }
    12291246
    12301247        if (braceCount < 0 || brackCount < 0 || parenCount < 0
    … …  
    12341251        }
    12351252    }
     1253
     1254    if(target == COMMA && angleCount != 0 && possible != -1) {
     1255        index = possible;
     1256        return true;
     1257    }
     1258
    12361259    return false;
    12371260}
    … …  
    12911314}
    12921315
     1316void Moc::checkProperties(ClassDef *cdef)
     1317{
     1318    //
     1319    // specify get function, for compatibiliy we accept functions
     1320    // returning pointers, or const char * for QByteArray.
     1321    //
     1322    for (int i = 0; i < cdef->propertyList.count(); ++i) {
     1323        PropertyDef &p = cdef->propertyList[i];
     1324        if (p.read.isEmpty())
     1325            continue;
     1326        for (int j = 0; j < cdef->publicList.count(); ++j) {
     1327            const FunctionDef &f = cdef->publicList.at(j);
     1328            if (f.name != p.read)
     1329                continue;
     1330            if (!f.isConst) // get  functions must be const
     1331                continue;
     1332            if (f.arguments.size()) // and must not take any arguments
     1333                continue;
     1334            PropertyDef::Specification spec = PropertyDef::ValueSpec;
     1335            QByteArray tmp = f.normalizedType;
     1336            if (p.type == "QByteArray" && tmp == "const char *")
     1337                tmp = "QByteArray";
     1338            if (tmp.left(6) == "const ")
     1339                tmp = tmp.mid(6);
     1340            if (p.type != tmp && tmp.endsWith('*')) {
     1341                tmp.chop(1);
     1342                spec = PropertyDef::PointerSpec;
     1343            } else if (f.type.name.endsWith('&')) { // raw type, not normalized type
     1344                spec = PropertyDef::ReferenceSpec;
     1345            }
     1346            if (p.type != tmp)
     1347                continue;
     1348            p.gspec = spec;
     1349            break;
     1350        }
     1351        if(!p.notify.isEmpty()) {
     1352            int notifyId = -1;
     1353            for (int j = 0; j < cdef->signalList.count(); ++j) {
     1354                const FunctionDef &f = cdef->signalList.at(j);
     1355                if(f.name != p.notify) {
     1356                    continue;
     1357                } else {
     1358                    notifyId = j /* Signal indexes start from 0 */;
     1359                    break;
     1360                }
     1361            }
     1362            p.notifyId = notifyId;
     1363            if (notifyId == -1) {
     1364                QByteArray msg = "NOTIFY signal '" + p.notify + "' of property '" + p.name
     1365                        + "' does not exist in class " + cdef->classname + ".";
     1366                error(msg.constData());
     1367            }
     1368        }
     1369    }
     1370}
     1371
     1372
    12931373
    12941374QT_END_NAMESPACE

  • trunk/src/tools/moc/moc.h

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    5656struct Type
    5757{
    58     enum ReferenceType { NoReference, Reference, Pointer };
     58    enum ReferenceType { NoReference, Reference, RValueReference, Pointer };
    5959
    6060    inline Type() : isVolatile(false), isScoped(false), firstToken(NOTOKEN), referenceType(NoReference) {}
    … …  
    239239
    240240    void checkSuperClasses(ClassDef *def);
     241    void checkProperties(ClassDef* cdef);
    241242};
    242243
    243244inline QByteArray noRef(const QByteArray &type)
    244245{
    245     if (type.endsWith('&'))
     246    if (type.endsWith('&')) {
     247        if (type.endsWith("&&"))
     248            return type.left(type.length()-2);
    246249        return type.left(type.length()-1);
     250    }
    247251    return type;
    248252}

  • trunk/src/tools/moc/mwerks_mac.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/mwerks_mac.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/outputrevision.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/parser.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/parser.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/ppkeywords.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/preprocessor.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/preprocessor.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/symbols.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/token.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/token.h

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    22#############################################################################
    33##
    4 ## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     4## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    55## All rights reserved.
    66## Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/util/generate_keywords.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/util/generate_keywords.pro

    r2 r846  
    1111SOURCES += generate_keywords.cpp
    1212CONFIG += qt create_prl link_prl
    13 OBJECTS_DIR=.obj/debug-shared

  • trunk/src/tools/moc/util/licenseheader.txt

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/moc/utils.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/rcc/rcc.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    545545    RCCFileInfo *s = new RCCFileInfo(file);
    546546    s->m_parent = parent;
    547     if (parent->m_children.contains(filename))
    548         qWarning("potential duplicate alias detected: '%s'", qPrintable(filename));
     547    if (parent->m_children.contains(filename)) {
     548        foreach (const QString &fileName, m_fileNames)
     549            qWarning("%s: Warning: potential duplicate alias detected: '%s'",
     550                     qPrintable(fileName), qPrintable(filename));
     551        }
    549552    parent->m_children.insertMulti(filename, s);
    550553    return true;

  • trunk/src/tools/rcc/rcc.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/tools.pro

    r561 r846  
    11TEMPLATE = subdirs
    22
    3 TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic
     3TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc
     4!contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic
    45!cross_compile {
    56    contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
    … …  
    2122src_tools_idc.target = sub-idc
    2223
    23 !wince*:!symbian:!ordered {
     24!wince*:!ordered {
    2425    # Set dependencies for each subdir
    2526    src_tools_moc.depends = src_tools_bootstrap
    … …  
    4546        !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc) | isEqual(subname, src_tools_uic3)):!separate_debug_info {
    4647            #debug
    47             eval(debug-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS)
    48             eval(debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug))
     48            debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
     49            debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
    4950            EXTRA_DEBUG_TARGETS += debug-$${subtarget}
    5051            QMAKE_EXTRA_TARGETS += debug-$${subtarget}
    5152            #release
    52             eval(release-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS)
    53             eval(release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release))
     53            release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
     54            release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
    5455            EXTRA_RELEASE_TARGETS += release-$${subtarget}
    5556            QMAKE_EXTRA_TARGETS += release-$${subtarget}
    5657        } else { #do not have a real debug target/release
    5758            #debug
    58             eval(debug-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS)
    59             eval(debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first))
     59            debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
     60            debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
    6061            EXTRA_DEBUG_TARGETS += debug-$${subtarget}
    6162            QMAKE_EXTRA_TARGETS += debug-$${subtarget}
    6263            #release
    63             eval(release-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS)
    64             eval(release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first))
     64            release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
     65            release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
    6566            EXTRA_RELEASE_TARGETS += release-$${subtarget}
    6667            QMAKE_EXTRA_TARGETS += release-$${subtarget}

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    7777        f.setFileName(m_option.qrcOutputFile);
    7878        if (!f.open(QIODevice::WriteOnly | QFile::Text)) {
    79             fprintf(stderr, "Could not create resource file\n");
     79            fprintf(stderr, "%s: Error: Could not create resource file\n", qPrintable(m_option.messagePrefix()));
    8080            return;
    8181        }
    … …  
    8484        QDir dir = fi.absoluteDir();
    8585        if (!dir.exists(QLatin1String("images")) && !dir.mkdir(QLatin1String("images"))) {
    86             fprintf(stderr, "Could not create image dir\n");
     86            fprintf(stderr, "%s: Error: Could not create image dir\n", qPrintable(m_option.messagePrefix()));
    8787            return;
    8888        }
    … …  
    127127        openMode |= QIODevice::Text;
    128128    if (!f.open(openMode)) {
    129         fprintf(stderr, "Could not create image file %s: %s", qPrintable(fname), qPrintable(f.errorString()));
     129        fprintf(stderr, "%s: Error: Could not create image file %s: %s",
     130                qPrintable(m_option.messagePrefix()),
     131                qPrintable(fname), qPrintable(f.errorString()));
    130132        return;
    131133    }
    … …  
    135137        imageOut->setCodec(QTextCodec::codecForName("UTF-8"));
    136138
    137         CPP::WriteIconData::writeImage(*imageOut, QString(), image);
     139        CPP::WriteIconData::writeImage(*imageOut, QString(), m_option.limitXPM_LineLength, image);
    138140        delete imageOut;
    139141    } else {

  • trunk/src/tools/uic/cpp/cppextractimages.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic/cpp/cppwritedeclaration.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    115115void WriteIconData::acceptImage(DomImage *image)
    116116{
    117     writeImage(output, option.indent, image);
     117    // Limit line length when writing code.
     118    writeImage(output, option.indent, true, image);
    118119}
    119120
    120 void WriteIconData::writeImage(QTextStream &output, const QString &indent, DomImage *image)
     121void WriteIconData::writeImage(QTextStream &output, const QString &indent,
     122                               bool limitXPM_LineLength, const DomImage *image)
    121123{
    122124    QString img = image->attributeName() + QLatin1String("_data");
    … …  
    134136        int column = 0;
    135137        bool inQuote = false;
    136         output << indent << "static const char* const " << img << "[] = { \n";
     138        output << indent << "/* XPM */\n"
     139               << indent << "static const char* const " << img << "[] = { \n";
    137140        while (baunzip[a] != '\"')
    138141            a++;
    … …  
    145148            }
    146149
    147             if (column++ >= 511 && inQuote) {
     150            column++;
     151            if (limitXPM_LineLength && column >= 512 && inQuote) {
    148152                output << "\"\n\""; // be nice with MSVC & Co.
    149153                column = 1;

  • trunk/src/tools/uic/cpp/cppwriteicondata.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    6565    void acceptImage(DomImage *image);
    6666
    67     static void writeImage(QTextStream &output, const QString &indent, DomImage *image);
     67    static void writeImage(QTextStream &output, const QString &indent,
     68                           bool limitXPM_LineLength, const DomImage *image);
    6869    static void writeImage(QIODevice &output, DomImage *image);
    6970

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic/cpp/cppwriteicondeclaration.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic/cpp/cppwriteiconinitialization.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    127127    if (m_uic->hasExternalPixmap() && m_uic->pixmapFunction() == QLatin1String("qPixmapFromMimeSource")) {
    128128#ifdef QT_NO_QT3_SUPPORT
    129         qWarning("Warning: The form file has external pixmaps or qPixmapFromMimeSource() set as a pixmap function. "
    130                  "This requires Qt 3 support, which is disabled. The resulting code will not compile.");
     129        qWarning("%s: Warning: The form file has external pixmaps or qPixmapFromMimeSource() set as a pixmap function. "
     130                 "This requires Qt 3 support, which is disabled. The resulting code will not compile.",
     131                 qPrintable(m_uic->option().messagePrefix()));
    131132#endif
    132133        add(QLatin1String("Q3MimeSourceFactory"));
    … …  
    213214        header += QLatin1String(".h");
    214215        if (warnHeaderGeneration) {
    215             qWarning("Warning: generated header '%s' for class '%s'.", qPrintable(header),
    216                      qPrintable(className));
     216            qWarning("%s: Warning: generated header '%s' for class '%s'.",
     217                     qPrintable(m_uic->option().messagePrefix()),
     218                     qPrintable(header), qPrintable(className));
    217219
    218220        }

  • trunk/src/tools/uic/cpp/cppwriteincludes.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    156156                if (!isIconFormat44(dri)) {
    157157                    if (dri->text().isEmpty())  {
    158                         const QString msg = QString::fromUtf8("%1: An invalid icon property '%2' was encountered.").arg(fileName).arg(p->attributeName());
     158                        const QString msg = QString::fromUtf8("%1: Warning: An invalid icon property '%2' was encountered.").arg(fileName).arg(p->attributeName());
    159159                        qWarning("%s", qPrintable(msg));
    160160                        return false;
    … …  
    166166            if (const DomResourcePixmap *drp = p->elementPixmap())
    167167                if (drp->text().isEmpty()) {
    168                     const QString msg = QString::fromUtf8("%1: An invalid pixmap property '%2' was encountered.").arg(fileName).arg(p->attributeName());
     168                    const QString msg = QString::fromUtf8("%1: Warning: An invalid pixmap property '%2' was encountered.").arg(fileName).arg(p->attributeName());
    169169                    qWarning("%s", qPrintable(msg));
    170170                    return false;
    … …  
    540540
    541541        if (!m_registeredWidgets.contains(b.objName)) {
    542             fprintf(stderr, "'%s' isn't a valid widget\n", b.objName.toLatin1().data());
     542            fprintf(stderr, "%s: Warning: Buddy assignment: '%s' is not a valid widget.\n",
     543                    qPrintable(m_option.messagePrefix()),
     544                    b.objName.toLatin1().data());
    543545            continue;
    544546        } else if (!m_registeredWidgets.contains(b.buddy)) {
    545             fprintf(stderr, "'%s' isn't a valid widget\n", b.buddy.toLatin1().data());
     547            fprintf(stderr, "%s: Warning: Buddy assignment: '%s' is not a valid widget.\n",
     548                    qPrintable(m_option.messagePrefix()),
     549                    b.buddy.toLatin1().data());
    546550            continue;
    547551        }
    … …  
    868872
    869873        if (!m_registeredWidgets.contains(name)) {
    870             fprintf(stderr, "'%s' isn't a valid widget\n", name.toLatin1().data());
     874            fprintf(stderr, "%s: Warning: Z-order assignment: '%s' is not a valid widget.\n",
     875                    qPrintable(m_option.messagePrefix()),
     876                    name.toLatin1().data());
    871877            continue;
    872878        }
    … …  
    896902        newGroup->setAttributeName(attributeName);
    897903        group = newGroup;
    898         fprintf(stderr, "Warning: Creating button group `%s'\n", attributeName.toLatin1().data());
     904        fprintf(stderr, "%s: Warning: Creating button group `%s'\n",
     905                qPrintable(m_option.messagePrefix()),
     906                attributeName.toLatin1().data());
    899907    }
    900908    const QString groupName = m_driver->findOrInsertButtonGroup(group);
    … …  
    11641172        }
    11651173    } else if (!(m_driver->actionByName(actionName) || isSeparator)) {
    1166         fprintf(stderr, "Warning: action `%s' not declared\n", actionName.toLatin1().data());
     1174        fprintf(stderr, "%s: Warning: action `%s' not declared\n",
     1175                qPrintable(m_option.messagePrefix()),
     1176                actionName.toLatin1().data());
    11671177        return;
    11681178    }
    … …  
    18541864
    18551865        if (!m_registeredWidgets.contains(name)) {
    1856             fprintf(stderr, "'%s' isn't a valid widget\n", name.toLatin1().data());
     1866            fprintf(stderr, "%s: Warning: Tab-stop assignment: '%s' is not a valid widget.\n",
     1867                    qPrintable(m_option.messagePrefix()),
     1868                    name.toLatin1().data());
    18571869            continue;
    18581870        }
    … …  
    20842096        break;
    20852097    default:
    2086         qWarning() << "Warning: Unknown icon format encountered. The ui-file was generated with a too-recent version of Designer.";
     2098        qWarning("%s: Warning: Unknown icon format encountered. The ui-file was generated with a too-recent version of Designer.",
     2099                 qPrintable(m_option.messagePrefix()));
    20872100        return QLatin1String("QIcon()");
    20882101        break;
    … …  
    25742587
    25752588    if (table.isEmpty() || connection.isEmpty()) {
    2576         fprintf(stderr, "invalid database connection\n");
     2589        fprintf(stderr, "%s: Warning: Invalid database connection\n", qPrintable(m_option.messagePrefix()));
    25772590        return;
    25782591    }
    … …  
    26142627
    26152628    if (table.isEmpty() || connection.isEmpty()) {
    2616         fprintf(stderr, "invalid database connection\n");
     2629        fprintf(stderr, "%s: Warning: Invalid database connection\n", qPrintable(m_option.messagePrefix()));
    26172630        return;
    26182631    }

  • trunk/src/tools/uic/cpp/cppwriteinitialization.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    179179
    180180    if (alreadyUsed && className.size()) {
    181         fprintf(stderr, "Warning: name %s is already used\n", qPrintable(instanceName));
     181        fprintf(stderr, "%s: Warning: The name '%s' (%s) is already in use, defaulting to '%s'.\n",
     182                qPrintable(m_option.messagePrefix()),
     183                qPrintable(instanceName), qPrintable(className),
     184                qPrintable(name));
    182185    }
    183186

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4444
    4545#include <QtCore/QString>
     46#include <QtCore/QDir>
    4647
    4748QT_BEGIN_NAMESPACE
    … …  
    6263    unsigned int dependencies : 1;
    6364    unsigned int extractImages : 1;
     65    unsigned int limitXPM_LineLength : 1;
    6466    unsigned int implicitIncludes: 1;
    6567    Generator generator;
    … …  
    8688          dependencies(0),
    8789          extractImages(0),
     90          limitXPM_LineLength(0),
    8891          implicitIncludes(1),
    8992          generator(CppGenerator),
    9093          prefix(QLatin1String("Ui_"))
    9194    { indent.fill(QLatin1Char(' '), 4); }
     95
     96    QString messagePrefix() const
     97    {
     98        return inputFile.isEmpty() ?
     99               QString(QLatin1String("stdin")) :
     100               QDir::toNativeSeparators(inputFile);
     101    }
    92102};
    93103

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

    r769 r846  
    1 QT_CLASS_LIB(QXmlStreamStringRef, QtCore, qxmlstream.h)
    2 QT_CLASS_LIB(QXmlStreamAttribute, QtCore, qxmlstream.h)
    3 QT_CLASS_LIB(QXmlStreamAttributes, QtCore, qxmlstream.h)
    4 QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtCore, qxmlstream.h)
    5 QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtCore, qxmlstream.h)
    6 QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtCore, qxmlstream.h)
    7 QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtCore, qxmlstream.h)
    8 QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtCore, qxmlstream.h)
    9 QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtCore, qxmlstream.h)
    10 QT_CLASS_LIB(QXmlStreamEntityResolver, QtCore, qxmlstream.h)
    11 QT_CLASS_LIB(QXmlStreamReader, QtCore, qxmlstream.h)
    12 QT_CLASS_LIB(QXmlStreamWriter, QtCore, qxmlstream.h)
    13 QT_CLASS_LIB(QAbstractFileEngine, QtCore, qabstractfileengine.h)
    14 QT_CLASS_LIB(QAbstractFileEngineHandler, QtCore, qabstractfileengine.h)
    15 QT_CLASS_LIB(QAbstractFileEngineIterator, QtCore, qabstractfileengine.h)
    16 QT_CLASS_LIB(QBuffer, QtCore, qbuffer.h)
    17 QT_CLASS_LIB(QDataStream, QtCore, qdatastream.h)
    18 QT_CLASS_LIB(QtDebug, QtCore, qdebug.h)
    19 QT_CLASS_LIB(QDebug, QtCore, qdebug.h)
    20 QT_CLASS_LIB(QNoDebug, QtCore, qdebug.h)
    21 QT_CLASS_LIB(QDir, QtCore, qdir.h)
    22 QT_CLASS_LIB(QDirIterator, QtCore, qdiriterator.h)
    23 QT_CLASS_LIB(QFile, QtCore, qfile.h)
    24 QT_CLASS_LIB(QFileInfo, QtCore, qfileinfo.h)
    25 QT_CLASS_LIB(QFileInfoList, QtCore, qfileinfo.h)
    26 QT_CLASS_LIB(QFileInfoListIterator, QtCore, qfileinfo.h)
    27 QT_CLASS_LIB(QFileSystemWatcher, QtCore, qfilesystemwatcher.h)
    28 QT_CLASS_LIB(QFSFileEngine, QtCore, qfsfileengine.h)
    29 QT_CLASS_LIB(QIODevice, QtCore, qiodevice.h)
    30 QT_CLASS_LIB(Q_PID, QtCore, qprocess.h)
    31 QT_CLASS_LIB(QProcessEnvironment, QtCore, qprocess.h)
    32 QT_CLASS_LIB(QProcess, QtCore, qprocess.h)
    33 QT_CLASS_LIB(QResource, QtCore, qresource.h)
    34 QT_CLASS_LIB(QSettings, QtCore, qsettings.h)
    35 QT_CLASS_LIB(QTemporaryFile, QtCore, qtemporaryfile.h)
    36 QT_CLASS_LIB(QTextStream, QtCore, qtextstream.h)
    37 QT_CLASS_LIB(QTextStreamFunction, QtCore, qtextstream.h)
    38 QT_CLASS_LIB(QTextStreamManipulator, QtCore, qtextstream.h)
    39 QT_CLASS_LIB(QTS, QtCore, qtextstream.h)
    40 QT_CLASS_LIB(QTextIStream, QtCore, qtextstream.h)
    41 QT_CLASS_LIB(QTextOStream, QtCore, qtextstream.h)
    42 QT_CLASS_LIB(QUrl, QtCore, qurl.h)
    43 QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h)
    44 QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h)
    45 QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h)
    46 QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h)
    47 QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h)
     1QT_CLASS_LIB(QAbstractAnimation, QtCore, qabstractanimation.h)
     2QT_CLASS_LIB(QAnimationGroup, QtCore, qanimationgroup.h)
     3QT_CLASS_LIB(QParallelAnimationGroup, QtCore, qparallelanimationgroup.h)
     4QT_CLASS_LIB(QPauseAnimation, QtCore, qpauseanimation.h)
     5QT_CLASS_LIB(QPropertyAnimation, QtCore, qpropertyanimation.h)
     6QT_CLASS_LIB(QSequentialAnimationGroup, QtCore, qsequentialanimationgroup.h)
     7QT_CLASS_LIB(QVariantAnimation, QtCore, qvariantanimation.h)
     8QT_CLASS_LIB(QAbstractEventDispatcher, QtCore, qabstracteventdispatcher.h)
     9QT_CLASS_LIB(QModelIndex, QtCore, qabstractitemmodel.h)
     10QT_CLASS_LIB(QPersistentModelIndex, QtCore, qabstractitemmodel.h)
     11QT_CLASS_LIB(QModelIndexList, QtCore, qabstractitemmodel.h)
     12QT_CLASS_LIB(QAbstractItemModel, QtCore, qabstractitemmodel.h)
     13QT_CLASS_LIB(QAbstractTableModel, QtCore, qabstractitemmodel.h)
     14QT_CLASS_LIB(QAbstractListModel, QtCore, qabstractitemmodel.h)
     15QT_CLASS_LIB(QBasicTimer, QtCore, qbasictimer.h)
     16QT_CLASS_LIB(QCoreApplication, QtCore, qcoreapplication.h)
     17QT_CLASS_LIB(QtCleanUpFunction, QtCore, qcoreapplication.h)
     18QT_CLASS_LIB(QEvent, QtCore, qcoreevent.h)
     19QT_CLASS_LIB(QTimerEvent, QtCore, qcoreevent.h)
     20QT_CLASS_LIB(QChildEvent, QtCore, qcoreevent.h)
     21QT_CLASS_LIB(QCustomEvent, QtCore, qcoreevent.h)
     22QT_CLASS_LIB(QDynamicPropertyChangeEvent, QtCore, qcoreevent.h)
     23QT_CLASS_LIB(QEventLoop, QtCore, qeventloop.h)
     24QT_CLASS_LIB(QMetaMethod, QtCore, qmetaobject.h)
     25QT_CLASS_LIB(QMetaEnum, QtCore, qmetaobject.h)
     26QT_CLASS_LIB(QMetaProperty, QtCore, qmetaobject.h)
     27QT_CLASS_LIB(QMetaClassInfo, QtCore, qmetaobject.h)
     28QT_CLASS_LIB(QMetaType, QtCore, qmetatype.h)
     29QT_CLASS_LIB(QMetaTypeId, QtCore, qmetatype.h)
     30QT_CLASS_LIB(QMetaTypeId2, QtCore, qmetatype.h)
     31QT_CLASS_LIB(QMimeData, QtCore, qmimedata.h)
     32QT_CLASS_LIB(QObjectList, QtCore, qobject.h)
     33QT_CLASS_LIB(QObjectData, QtCore, qobject.h)
     34QT_CLASS_LIB(QObject, QtCore, qobject.h)
     35QT_CLASS_LIB(QObjectUserData, QtCore, qobject.h)
     36QT_CLASS_LIB(QObjectCleanupHandler, QtCore, qobjectcleanuphandler.h)
     37QT_CLASS_LIB(QGenericArgument, QtCore, qobjectdefs.h)
     38QT_CLASS_LIB(QGenericReturnArgument, QtCore, qobjectdefs.h)
     39QT_CLASS_LIB(QArgument, QtCore, qobjectdefs.h)
     40QT_CLASS_LIB(QReturnArgument, QtCore, qobjectdefs.h)
     41QT_CLASS_LIB(QMetaObject, QtCore, qobjectdefs.h)
     42QT_CLASS_LIB(QMetaObjectAccessor, QtCore, qobjectdefs.h)
     43QT_CLASS_LIB(QMetaObjectExtraData, QtCore, qobjectdefs.h)
     44QT_CLASS_LIB(QPointer, QtCore, qpointer.h)
     45QT_CLASS_LIB(QSharedMemory, QtCore, qsharedmemory.h)
     46QT_CLASS_LIB(QSignalMapper, QtCore, qsignalmapper.h)
     47QT_CLASS_LIB(QSocketNotifier, QtCore, qsocketnotifier.h)
     48QT_CLASS_LIB(QSystemSemaphore, QtCore, qsystemsemaphore.h)
     49QT_CLASS_LIB(QTimer, QtCore, qtimer.h)
     50QT_CLASS_LIB(QTranslator, QtCore, qtranslator.h)
     51QT_CLASS_LIB(QVariant, QtCore, qvariant.h)
     52QT_CLASS_LIB(QVariantList, QtCore, qvariant.h)
     53QT_CLASS_LIB(QVariantMap, QtCore, qvariant.h)
     54QT_CLASS_LIB(QVariantHash, QtCore, qvariant.h)
     55QT_CLASS_LIB(QVariantComparisonHelper, QtCore, qvariant.h)
     56QT_CLASS_LIB(QtEndian, QtCore, qendian.h)
     57QT_CLASS_LIB(QtGlobal, QtCore, qglobal.h)
     58QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     59QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     60QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     61QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     62QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
     63QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h)
     64QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h)
     65QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h)
     66QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h)
     67QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h)
     68QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h)
     69QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h)
     70QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h)
     71QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h)
     72QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h)
     73QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h)
     74QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
     75QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
     76QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
     77QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
     78QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h)
     79QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h)
     80QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
     81QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
     82QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h)
     83QT_CLASS_LIB(QBool, QtCore, qglobal.h)
     84QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
     85QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
     86QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
     87QT_CLASS_LIB(QFlag, QtCore, qglobal.h)
     88QT_CLASS_LIB(QIncompatibleFlag, QtCore, qglobal.h)
     89QT_CLASS_LIB(QFlags, QtCore, qglobal.h)
     90QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
     91QT_CLASS_LIB(QForeachContainerBase, QtCore, qglobal.h)
     92QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
     93QT_CLASS_LIB(QLibraryInfo, QtCore, qlibraryinfo.h)
     94QT_CLASS_LIB(Qt, QtCore, qnamespace.h)
     95QT_CLASS_LIB(QInternal, QtCore, qnamespace.h)
     96QT_CLASS_LIB(QCOORD, QtCore, qnamespace.h)
     97QT_CLASS_LIB(QtConfig, QtCore, qconfig.h)
     98QT_CLASS_LIB(QAtomicInt, QtCore, qatomic.h)
     99QT_CLASS_LIB(QAtomicPointer, QtCore, qatomic.h)
     100QT_CLASS_LIB(QBasicAtomicInt, QtCore, qbasicatomic.h)
     101QT_CLASS_LIB(QBasicAtomicPointer, QtCore, qbasicatomic.h)
     102QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
     103QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
     104QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
     105QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
     106QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
     107QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
     108QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
     109QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
     110QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
     111QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
     112QT_CLASS_LIB(QSemaphore, QtCore, qsemaphore.h)
     113QT_CLASS_LIB(QThread, QtCore, qthread.h)
     114QT_CLASS_LIB(QThread, QtCore, qthread.h)
     115QT_CLASS_LIB(QThreadStorageData, QtCore, qthreadstorage.h)
     116QT_CLASS_LIB(QThreadStorage, QtCore, qthreadstorage.h)
     117QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
     118QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
     119QT_CLASS_LIB(QFactoryInterface, QtCore, qfactoryinterface.h)
     120QT_CLASS_LIB(QLibrary, QtCore, qlibrary.h)
     121QT_CLASS_LIB(QtPlugin, QtCore, qplugin.h)
     122QT_CLASS_LIB(QtPluginInstanceFunction, QtCore, qplugin.h)
     123QT_CLASS_LIB(QPluginLoader, QtCore, qpluginloader.h)
     124QT_CLASS_LIB(QUuid, QtCore, quuid.h)
    48125QT_CLASS_LIB(QtAlgorithms, QtCore, qalgorithms.h)
    49126QT_CLASS_LIB(QBitArray, QtCore, qbitarray.h)
    … …  
    64141QT_CLASS_LIB(QDateTime, QtCore, qdatetime.h)
    65142QT_CLASS_LIB(QEasingCurve, QtCore, qeasingcurve.h)
     143QT_CLASS_LIB(QElapsedTimer, QtCore, qelapsedtimer.h)
    66144QT_CLASS_LIB(QHashData, QtCore, qhash.h)
    67145QT_CLASS_LIB(QHashDummyValue, QtCore, qhash.h)
    … …  
    135213QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
    136214QT_CLASS_LIB(QStringBuilder, QtCore, qstringbuilder.h)
     215QT_CLASS_LIB(QStringBuilder, QtCore, qstringbuilder.h)
    137216QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
    138217QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h)
    … …  
    160239QT_CLASS_LIB(QVectorIterator, QtCore, qvector.h)
    161240QT_CLASS_LIB(QMutableVectorIterator, QtCore, qvector.h)
    162 QT_CLASS_LIB(QtEndian, QtCore, qendian.h)
    163 QT_CLASS_LIB(QtGlobal, QtCore, qglobal.h)
    164 QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
    165 QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
    166 QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
    167 QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
    168 QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
    169 QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h)
    170 QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h)
    171 QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h)
    172 QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h)
    173 QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h)
    174 QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h)
    175 QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h)
    176 QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h)
    177 QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h)
    178 QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h)
    179 QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h)
    180 QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
    181 QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
    182 QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
    183 QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
    184 QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h)
    185 QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h)
    186 QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
    187 QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
    188 QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h)
    189 QT_CLASS_LIB(QBool, QtCore, qglobal.h)
    190 QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
    191 QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
    192 QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
    193 QT_CLASS_LIB(QFlag, QtCore, qglobal.h)
    194 QT_CLASS_LIB(QIncompatibleFlag, QtCore, qglobal.h)
    195 QT_CLASS_LIB(QFlags, QtCore, qglobal.h)
    196 QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
    197 QT_CLASS_LIB(QForeachContainerBase, QtCore, qglobal.h)
    198 QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
    199 QT_CLASS_LIB(QLibraryInfo, QtCore, qlibraryinfo.h)
    200 QT_CLASS_LIB(Qt, QtCore, qnamespace.h)
    201 QT_CLASS_LIB(QInternal, QtCore, qnamespace.h)
    202 QT_CLASS_LIB(QCOORD, QtCore, qnamespace.h)
    203 QT_CLASS_LIB(QAbstractEventDispatcher, QtCore, qabstracteventdispatcher.h)
    204 QT_CLASS_LIB(QModelIndex, QtCore, qabstractitemmodel.h)
    205 QT_CLASS_LIB(QPersistentModelIndex, QtCore, qabstractitemmodel.h)
    206 QT_CLASS_LIB(QModelIndexList, QtCore, qabstractitemmodel.h)
    207 QT_CLASS_LIB(QAbstractItemModel, QtCore, qabstractitemmodel.h)
    208 QT_CLASS_LIB(QAbstractTableModel, QtCore, qabstractitemmodel.h)
    209 QT_CLASS_LIB(QAbstractListModel, QtCore, qabstractitemmodel.h)
    210 QT_CLASS_LIB(QBasicTimer, QtCore, qbasictimer.h)
    211 QT_CLASS_LIB(QCoreApplication, QtCore, qcoreapplication.h)
    212 QT_CLASS_LIB(QtCleanUpFunction, QtCore, qcoreapplication.h)
    213 QT_CLASS_LIB(QEvent, QtCore, qcoreevent.h)
    214 QT_CLASS_LIB(QTimerEvent, QtCore, qcoreevent.h)
    215 QT_CLASS_LIB(QChildEvent, QtCore, qcoreevent.h)
    216 QT_CLASS_LIB(QCustomEvent, QtCore, qcoreevent.h)
    217 QT_CLASS_LIB(QDynamicPropertyChangeEvent, QtCore, qcoreevent.h)
    218 QT_CLASS_LIB(QEventLoop, QtCore, qeventloop.h)
    219 QT_CLASS_LIB(QMetaMethod, QtCore, qmetaobject.h)
    220 QT_CLASS_LIB(QMetaEnum, QtCore, qmetaobject.h)
    221 QT_CLASS_LIB(QMetaProperty, QtCore, qmetaobject.h)
    222 QT_CLASS_LIB(QMetaClassInfo, QtCore, qmetaobject.h)
    223 QT_CLASS_LIB(QMetaType, QtCore, qmetatype.h)
    224 QT_CLASS_LIB(QMetaTypeId, QtCore, qmetatype.h)
    225 QT_CLASS_LIB(QMetaTypeId2, QtCore, qmetatype.h)
    226 QT_CLASS_LIB(QMimeData, QtCore, qmimedata.h)
    227 QT_CLASS_LIB(QObjectList, QtCore, qobject.h)
    228 QT_CLASS_LIB(QObjectData, QtCore, qobject.h)
    229 QT_CLASS_LIB(QObject, QtCore, qobject.h)
    230 QT_CLASS_LIB(QObjectUserData, QtCore, qobject.h)
    231 QT_CLASS_LIB(QObjectCleanupHandler, QtCore, qobjectcleanuphandler.h)
    232 QT_CLASS_LIB(QGenericArgument, QtCore, qobjectdefs.h)
    233 QT_CLASS_LIB(QGenericReturnArgument, QtCore, qobjectdefs.h)
    234 QT_CLASS_LIB(QArgument, QtCore, qobjectdefs.h)
    235 QT_CLASS_LIB(QReturnArgument, QtCore, qobjectdefs.h)
    236 QT_CLASS_LIB(QMetaObject, QtCore, qobjectdefs.h)
    237 QT_CLASS_LIB(QMetaObjectAccessor, QtCore, qobjectdefs.h)
    238 QT_CLASS_LIB(QMetaObjectExtraData, QtCore, qobjectdefs.h)
    239 QT_CLASS_LIB(QPointer, QtCore, qpointer.h)
    240 QT_CLASS_LIB(QSharedMemory, QtCore, qsharedmemory.h)
    241 QT_CLASS_LIB(QSignalMapper, QtCore, qsignalmapper.h)
    242 QT_CLASS_LIB(QSocketNotifier, QtCore, qsocketnotifier.h)
    243 QT_CLASS_LIB(QSystemSemaphore, QtCore, qsystemsemaphore.h)
    244 QT_CLASS_LIB(QTimer, QtCore, qtimer.h)
    245 QT_CLASS_LIB(QTranslator, QtCore, qtranslator.h)
    246 QT_CLASS_LIB(QVariant, QtCore, qvariant.h)
    247 QT_CLASS_LIB(QVariantList, QtCore, qvariant.h)
    248 QT_CLASS_LIB(QVariantMap, QtCore, qvariant.h)
    249 QT_CLASS_LIB(QVariantHash, QtCore, qvariant.h)
    250 QT_CLASS_LIB(QVariantComparisonHelper, QtCore, qvariant.h)
     241QT_CLASS_LIB(QXmlStreamStringRef, QtCore, qxmlstream.h)
     242QT_CLASS_LIB(QXmlStreamAttribute, QtCore, qxmlstream.h)
     243QT_CLASS_LIB(QXmlStreamAttributes, QtCore, qxmlstream.h)
     244QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtCore, qxmlstream.h)
     245QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtCore, qxmlstream.h)
     246QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtCore, qxmlstream.h)
     247QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtCore, qxmlstream.h)
     248QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtCore, qxmlstream.h)
     249QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtCore, qxmlstream.h)
     250QT_CLASS_LIB(QXmlStreamEntityResolver, QtCore, qxmlstream.h)
     251QT_CLASS_LIB(QXmlStreamReader, QtCore, qxmlstream.h)
     252QT_CLASS_LIB(QXmlStreamWriter, QtCore, qxmlstream.h)
     253QT_CLASS_LIB(QAbstractState, QtCore, qabstractstate.h)
     254QT_CLASS_LIB(QAbstractTransition, QtCore, qabstracttransition.h)
     255QT_CLASS_LIB(QEventTransition, QtCore, qeventtransition.h)
     256QT_CLASS_LIB(QFinalState, QtCore, qfinalstate.h)
     257QT_CLASS_LIB(QHistoryState, QtCore, qhistorystate.h)
     258QT_CLASS_LIB(QSignalTransition, QtCore, qsignaltransition.h)
     259QT_CLASS_LIB(QState, QtCore, qstate.h)
     260QT_CLASS_LIB(QStateMachine, QtCore, qstatemachine.h)
     261QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h)
     262QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h)
     263QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h)
     264QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h)
     265QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h)
     266QT_CLASS_LIB(QAbstractFileEngine, QtCore, qabstractfileengine.h)
     267QT_CLASS_LIB(QAbstractFileEngineHandler, QtCore, qabstractfileengine.h)
     268QT_CLASS_LIB(QAbstractFileEngineIterator, QtCore, qabstractfileengine.h)
     269QT_CLASS_LIB(QBuffer, QtCore, qbuffer.h)
     270QT_CLASS_LIB(QDataStream, QtCore, qdatastream.h)
     271QT_CLASS_LIB(QtDebug, QtCore, qdebug.h)
     272QT_CLASS_LIB(QDebug, QtCore, qdebug.h)
     273QT_CLASS_LIB(QNoDebug, QtCore, qdebug.h)
     274QT_CLASS_LIB(QDir, QtCore, qdir.h)
     275QT_CLASS_LIB(QDirIterator, QtCore, qdiriterator.h)
     276QT_CLASS_LIB(QFile, QtCore, qfile.h)
     277QT_CLASS_LIB(QFileInfo, QtCore, qfileinfo.h)
     278QT_CLASS_LIB(QFileInfoList, QtCore, qfileinfo.h)
     279QT_CLASS_LIB(QFileInfoListIterator, QtCore, qfileinfo.h)
     280QT_CLASS_LIB(QFileSystemWatcher, QtCore, qfilesystemwatcher.h)
     281QT_CLASS_LIB(QFSFileEngine, QtCore, qfsfileengine.h)
     282QT_CLASS_LIB(QIODevice, QtCore, qiodevice.h)
     283QT_CLASS_LIB(Q_PID, QtCore, qprocess.h)
     284QT_CLASS_LIB(QProcessEnvironment, QtCore, qprocess.h)
     285QT_CLASS_LIB(QProcess, QtCore, qprocess.h)
     286QT_CLASS_LIB(QResource, QtCore, qresource.h)
     287QT_CLASS_LIB(QSettings, QtCore, qsettings.h)
     288QT_CLASS_LIB(QTemporaryFile, QtCore, qtemporaryfile.h)
     289QT_CLASS_LIB(QTextStream, QtCore, qtextstream.h)
     290QT_CLASS_LIB(QTextStreamFunction, QtCore, qtextstream.h)
     291QT_CLASS_LIB(QTextStreamManipulator, QtCore, qtextstream.h)
     292QT_CLASS_LIB(QTS, QtCore, qtextstream.h)
     293QT_CLASS_LIB(QTextIStream, QtCore, qtextstream.h)
     294QT_CLASS_LIB(QTextOStream, QtCore, qtextstream.h)
     295QT_CLASS_LIB(QUrl, QtCore, qurl.h)
    251296QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
    252297QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h)
    … …  
    265310QT_CLASS_LIB(QtConcurrentRun, QtCore, qtconcurrentrun.h)
    266311QT_CLASS_LIB(QThreadPool, QtCore, qthreadpool.h)
    267 QT_CLASS_LIB(QFactoryInterface, QtCore, qfactoryinterface.h)
    268 QT_CLASS_LIB(QLibrary, QtCore, qlibrary.h)
    269 QT_CLASS_LIB(QtPlugin, QtCore, qplugin.h)
    270 QT_CLASS_LIB(QtPluginInstanceFunction, QtCore, qplugin.h)
    271 QT_CLASS_LIB(QPluginLoader, QtCore, qpluginloader.h)
    272 QT_CLASS_LIB(QUuid, QtCore, quuid.h)
    273 QT_CLASS_LIB(QAtomicInt, QtCore, qatomic.h)
    274 QT_CLASS_LIB(QAtomicPointer, QtCore, qatomic.h)
    275 QT_CLASS_LIB(QBasicAtomicInt, QtCore, qbasicatomic.h)
    276 QT_CLASS_LIB(QBasicAtomicPointer, QtCore, qbasicatomic.h)
    277 QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
    278 QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
    279 QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
    280 QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
    281 QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
    282 QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
    283 QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
    284 QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
    285 QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
    286 QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
    287 QT_CLASS_LIB(QSemaphore, QtCore, qsemaphore.h)
    288 QT_CLASS_LIB(QThread, QtCore, qthread.h)
    289 QT_CLASS_LIB(QThread, QtCore, qthread.h)
    290 QT_CLASS_LIB(QThreadStorageData, QtCore, qthreadstorage.h)
    291 QT_CLASS_LIB(QThreadStorage, QtCore, qthreadstorage.h)
    292 QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
    293 QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
    294 QT_CLASS_LIB(QAbstractState, QtCore, qabstractstate.h)
    295 QT_CLASS_LIB(QAbstractTransition, QtCore, qabstracttransition.h)
    296 QT_CLASS_LIB(QEventTransition, QtCore, qeventtransition.h)
    297 QT_CLASS_LIB(QFinalState, QtCore, qfinalstate.h)
    298 QT_CLASS_LIB(QHistoryState, QtCore, qhistorystate.h)
    299 QT_CLASS_LIB(QSignalTransition, QtCore, qsignaltransition.h)
    300 QT_CLASS_LIB(QState, QtCore, qstate.h)
    301 QT_CLASS_LIB(QStateMachine, QtCore, qstatemachine.h)
    302 QT_CLASS_LIB(QAbstractAnimation, QtCore, qabstractanimation.h)
    303 QT_CLASS_LIB(QAnimationGroup, QtCore, qanimationgroup.h)
    304 QT_CLASS_LIB(QParallelAnimationGroup, QtCore, qparallelanimationgroup.h)
    305 QT_CLASS_LIB(QPauseAnimation, QtCore, qpauseanimation.h)
    306 QT_CLASS_LIB(QPropertyAnimation, QtCore, qpropertyanimation.h)
    307 QT_CLASS_LIB(QSequentialAnimationGroup, QtCore, qsequentialanimationgroup.h)
    308 QT_CLASS_LIB(QVariantAnimation, QtCore, qvariantanimation.h)
     312QT_CLASS_LIB(QDeclarativeComponent, QtDeclarative, qdeclarativecomponent.h)
     313QT_CLASS_LIB(QDeclarativeContext, QtDeclarative, qdeclarativecontext.h)
     314QT_CLASS_LIB(QDeclarativeEngine, QtDeclarative, qdeclarativeengine.h)
     315QT_CLASS_LIB(QDeclarativeError, QtDeclarative, qdeclarativeerror.h)
     316QT_CLASS_LIB(QDeclarativeExpression, QtDeclarative, qdeclarativeexpression.h)
     317QT_CLASS_LIB(QDeclarativeExtensionInterface, QtDeclarative, qdeclarativeextensioninterface.h)
     318QT_CLASS_LIB(QDeclarativeExtensionPlugin, QtDeclarative, qdeclarativeextensionplugin.h)
     319QT_CLASS_LIB(QDeclarativeImageProvider, QtDeclarative, qdeclarativeimageprovider.h)
     320QT_CLASS_LIB(QDeclarativeInfo, QtDeclarative, qdeclarativeinfo.h)
     321QT_CLASS_LIB(QDeclarativeListProperty, QtDeclarative, qdeclarativelist.h)
     322QT_CLASS_LIB(QDeclarativeListReference, QtDeclarative, qdeclarativelist.h)
     323QT_CLASS_LIB(QDeclarativeNetworkAccessManagerFactory, QtDeclarative, qdeclarativenetworkaccessmanagerfactory.h)
     324QT_CLASS_LIB(QDeclarativeParserStatus, QtDeclarative, qdeclarativeparserstatus.h)
     325QT_CLASS_LIB(QDeclarativeAttachedPropertiesFunc, QtDeclarative, qdeclarativeprivate.h)
     326QT_CLASS_LIB(QDeclarativeTypeInfo, QtDeclarative, qdeclarativeprivate.h)
     327QT_CLASS_LIB(QDeclarativeProperty, QtDeclarative, qdeclarativeproperty.h)
     328QT_CLASS_LIB(QDeclarativeProperties, QtDeclarative, qdeclarativeproperty.h)
     329QT_CLASS_LIB(QDeclarativePropertyValueInterceptor, QtDeclarative, qdeclarativepropertyvalueinterceptor.h)
     330QT_CLASS_LIB(QDeclarativePropertyValueSource, QtDeclarative, qdeclarativepropertyvaluesource.h)
     331QT_CLASS_LIB(QDeclarativeScriptString, QtDeclarative, qdeclarativescriptstring.h)
     332QT_CLASS_LIB(QDeclarativeItem, QtDeclarative, qdeclarativeitem.h)
     333QT_CLASS_LIB(QDeclarativePropertyMap, QtDeclarative, qdeclarativepropertymap.h)
     334QT_CLASS_LIB(QDeclarativeView, QtDeclarative, qdeclarativeview.h)
    309335QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
    310336QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
    … …  
    315341QT_CLASS_LIB(QGLContext, QtOpenGL, qgl.h)
    316342QT_CLASS_LIB(QGLWidget, QtOpenGL, qgl.h)
     343QT_CLASS_LIB(QGLBuffer, QtOpenGL, qglbuffer.h)
    317344QT_CLASS_LIB(QGLColormap, QtOpenGL, qglcolormap.h)
    318345QT_CLASS_LIB(QGLFramebufferObject, QtOpenGL, qglframebufferobject.h)
    … …  
    323350QT_CLASS_LIB(QGLShader, QtOpenGL, qglshaderprogram.h)
    324351QT_CLASS_LIB(QGLShaderProgram, QtOpenGL, qglshaderprogram.h)
     352QT_CLASS_LIB(QXmlStreamAttribute, QtXml, qxmlstream.h)
     353QT_CLASS_LIB(QXmlStreamAttributes, QtXml, qxmlstream.h)
     354QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtXml, qxmlstream.h)
     355QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtXml, qxmlstream.h)
     356QT_CLASS_LIB(QXmlStreamEntityResolver, QtXml, qxmlstream.h)
     357QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtXml, qxmlstream.h)
     358QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtXml, qxmlstream.h)
     359QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtXml, qxmlstream.h)
     360QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtXml, qxmlstream.h)
     361QT_CLASS_LIB(QXmlStreamReader, QtXml, qxmlstream.h)
     362QT_CLASS_LIB(QXmlStreamStringRef, QtXml, qxmlstream.h)
     363QT_CLASS_LIB(QXmlStreamWriter, QtXml, qxmlstream.h)
    325364QT_CLASS_LIB(QXmlNamespaceSupport, QtXml, qxml.h)
    326365QT_CLASS_LIB(QXmlAttributes, QtXml, qxml.h)
    … …  
    354393QT_CLASS_LIB(QDomEntityReference, QtXml, qdom.h)
    355394QT_CLASS_LIB(QDomProcessingInstruction, QtXml, qdom.h)
    356 QT_CLASS_LIB(QXmlStreamAttribute, QtXml, qxmlstream.h)
    357 QT_CLASS_LIB(QXmlStreamAttributes, QtXml, qxmlstream.h)
    358 QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtXml, qxmlstream.h)
    359 QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtXml, qxmlstream.h)
    360 QT_CLASS_LIB(QXmlStreamEntityResolver, QtXml, qxmlstream.h)
    361 QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtXml, qxmlstream.h)
    362 QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtXml, qxmlstream.h)
    363 QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtXml, qxmlstream.h)
    364 QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtXml, qxmlstream.h)
    365 QT_CLASS_LIB(QXmlStreamReader, QtXml, qxmlstream.h)
    366 QT_CLASS_LIB(QXmlStreamStringRef, QtXml, qxmlstream.h)
    367 QT_CLASS_LIB(QXmlStreamWriter, QtXml, qxmlstream.h)
     395QT_CLASS_LIB(QAuthenticator, QtNetwork, qauthenticator.h)
     396QT_CLASS_LIB(QIPv6Address, QtNetwork, qhostaddress.h)
     397QT_CLASS_LIB(Q_IPV6ADDR, QtNetwork, qhostaddress.h)
     398QT_CLASS_LIB(QHostAddress, QtNetwork, qhostaddress.h)
     399QT_CLASS_LIB(QHostInfo, QtNetwork, qhostinfo.h)
     400QT_CLASS_LIB(QNetworkAddressEntry, QtNetwork, qnetworkinterface.h)
     401QT_CLASS_LIB(QNetworkInterface, QtNetwork, qnetworkinterface.h)
     402QT_CLASS_LIB(QNetworkProxyQuery, QtNetwork, qnetworkproxy.h)
     403QT_CLASS_LIB(QNetworkProxy, QtNetwork, qnetworkproxy.h)
     404QT_CLASS_LIB(QNetworkProxyFactory, QtNetwork, qnetworkproxy.h)
     405QT_CLASS_LIB(QUrlInfo, QtNetwork, qurlinfo.h)
     406QT_CLASS_LIB(QNetworkConfigurationManager, QtNetwork, qnetworkconfigmanager.h)
     407QT_CLASS_LIB(QNetworkConfiguration, QtNetwork, qnetworkconfiguration.h)
     408QT_CLASS_LIB(QNetworkSession, QtNetwork, qnetworksession.h)
    368409QT_CLASS_LIB(QNetworkCacheMetaData, QtNetwork, qabstractnetworkcache.h)
    369410QT_CLASS_LIB(QAbstractNetworkCache, QtNetwork, qabstractnetworkcache.h)
    … …  
    379420QT_CLASS_LIB(QNetworkReply, QtNetwork, qnetworkreply.h)
    380421QT_CLASS_LIB(QNetworkRequest, QtNetwork, qnetworkrequest.h)
    381 QT_CLASS_LIB(QAuthenticator, QtNetwork, qauthenticator.h)
    382 QT_CLASS_LIB(QIPv6Address, QtNetwork, qhostaddress.h)
    383 QT_CLASS_LIB(Q_IPV6ADDR, QtNetwork, qhostaddress.h)
    384 QT_CLASS_LIB(QHostAddress, QtNetwork, qhostaddress.h)
    385 QT_CLASS_LIB(QHostInfo, QtNetwork, qhostinfo.h)
    386 QT_CLASS_LIB(QNetworkAddressEntry, QtNetwork, qnetworkinterface.h)
    387 QT_CLASS_LIB(QNetworkInterface, QtNetwork, qnetworkinterface.h)
    388 QT_CLASS_LIB(QNetworkProxyQuery, QtNetwork, qnetworkproxy.h)
    389 QT_CLASS_LIB(QNetworkProxy, QtNetwork, qnetworkproxy.h)
    390 QT_CLASS_LIB(QNetworkProxyFactory, QtNetwork, qnetworkproxy.h)
    391 QT_CLASS_LIB(QUrlInfo, QtNetwork, qurlinfo.h)
    392422QT_CLASS_LIB(QAbstractSocket, QtNetwork, qabstractsocket.h)
    393423QT_CLASS_LIB(QLocalServer, QtNetwork, qlocalserver.h)
    … …  
    415445QT_CLASS_LIB(QHelpSearchQueryWidget, QtHelp, qhelpsearchquerywidget.h)
    416446QT_CLASS_LIB(QHelpSearchResultWidget, QtHelp, qhelpsearchresultwidget.h)
    417 QT_CLASS_LIB(QAssistantClient, QtAssistant, qassistantclient.h)
    418447QT_CLASS_LIB(QAbstractMessageHandler, QtXmlPatterns, qabstractmessagehandler.h)
    419448QT_CLASS_LIB(QAbstractUriResolver, QtXmlPatterns, qabstracturiresolver.h)
    … …  
    432461QT_CLASS_LIB(QXmlSchemaValidator, QtXmlPatterns, qxmlschemavalidator.h)
    433462QT_CLASS_LIB(QXmlSerializer, QtXmlPatterns, qxmlserializer.h)
     463QT_CLASS_LIB(QMeeGoFenceSync, QtMeeGoGraphicsSystemHelper, qmeegofencesync.h)
     464QT_CLASS_LIB(QMeeGoGraphicsSystemHelper, QtMeeGoGraphicsSystemHelper, qmeegographicssystemhelper.h)
     465QT_CLASS_LIB(QMeeGoLivePixmap, QtMeeGoGraphicsSystemHelper, qmeegolivepixmap.h)
     466QT_CLASS_LIB(QMeeGoOverlayWidget, QtMeeGoGraphicsSystemHelper, qmeegooverlaywidget.h)
     467QT_CLASS_LIB(QMeeGoRuntime, QtMeeGoGraphicsSystemHelper, qmeegoruntime.h)
     468QT_CLASS_LIB(QMeeGoSwitchEvent, QtMeeGoGraphicsSystemHelper, qmeegoswitchevent.h)
    434469QT_CLASS_LIB(QAxBase, ActiveQt, qaxbase.h)
    435470QT_CLASS_LIB(QAxObject, ActiveQt, qaxobject.h)
    … …  
    552587QT_CLASS_LIB(QSqlRelationalTableModel, QtSql, qsqlrelationaltablemodel.h)
    553588QT_CLASS_LIB(QSqlTableModel, QtSql, qsqltablemodel.h)
     589QT_CLASS_LIB(QTDSResult, QtSql, qsql_tds.h)
     590QT_CLASS_LIB(QTDSDriver, QtSql, qsql_tds.h)
    554591QT_CLASS_LIB(QSQLite2Result, QtSql, qsql_sqlite2.h)
    555592QT_CLASS_LIB(QSQLite2Driver, QtSql, qsql_sqlite2.h)
    556 QT_CLASS_LIB(QODBCResult, QtSql, qsql_odbc.h)
    557 QT_CLASS_LIB(QODBCDriver, QtSql, qsql_odbc.h)
    558 QT_CLASS_LIB(QTDSResult, QtSql, qsql_tds.h)
    559 QT_CLASS_LIB(QTDSDriver, QtSql, qsql_tds.h)
    560 QT_CLASS_LIB(QIBaseResult, QtSql, qsql_ibase.h)
    561 QT_CLASS_LIB(QIBaseDriver, QtSql, qsql_ibase.h)
    562593QT_CLASS_LIB(QSQLiteResult, QtSql, qsql_sqlite.h)
    563594QT_CLASS_LIB(QSQLiteDriver, QtSql, qsql_sqlite.h)
    564 QT_CLASS_LIB(QMYSQLResult, QtSql, qsql_mysql.h)
    565 QT_CLASS_LIB(QMYSQLDriver, QtSql, qsql_mysql.h)
    566595QT_CLASS_LIB(QPSQLResult, QtSql, qsql_psql.h)
    567596QT_CLASS_LIB(QPSQLDriver, QtSql, qsql_psql.h)
    568597QT_CLASS_LIB(QOCIResult, QtSql, qsql_oci.h)
    569598QT_CLASS_LIB(QOCIDriver, QtSql, qsql_oci.h)
     599QT_CLASS_LIB(QIBaseResult, QtSql, qsql_ibase.h)
     600QT_CLASS_LIB(QIBaseDriver, QtSql, qsql_ibase.h)
     601QT_CLASS_LIB(QODBCResult, QtSql, qsql_odbc.h)
     602QT_CLASS_LIB(QODBCDriver, QtSql, qsql_odbc.h)
    570603QT_CLASS_LIB(QDB2Result, QtSql, qsql_db2.h)
    571604QT_CLASS_LIB(QDB2Driver, QtSql, qsql_db2.h)
    572 QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h)
    573 QT_CLASS_LIB(QIcon, QtGui, qicon.h)
    574 QT_CLASS_LIB(QIconSet, QtGui, qicon.h)
    575 QT_CLASS_LIB(QIconEngine, QtGui, qiconengine.h)
    576 QT_CLASS_LIB(QIconEngineV2, QtGui, qiconengine.h)
    577 QT_CLASS_LIB(QIconEngineFactoryInterface, QtGui, qiconengineplugin.h)
    578 QT_CLASS_LIB(QIconEnginePlugin, QtGui, qiconengineplugin.h)
    579 QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtGui, qiconengineplugin.h)
    580 QT_CLASS_LIB(QIconEnginePluginV2, QtGui, qiconengineplugin.h)
    581 QT_CLASS_LIB(QImageTextKeyLang, QtGui, qimage.h)
    582 QT_CLASS_LIB(QImage, QtGui, qimage.h)
    583 QT_CLASS_LIB(QImageIOHandler, QtGui, qimageiohandler.h)
    584 QT_CLASS_LIB(QImageIOHandlerFactoryInterface, QtGui, qimageiohandler.h)
    585 QT_CLASS_LIB(QImageIOPlugin, QtGui, qimageiohandler.h)
    586 QT_CLASS_LIB(QImageReader, QtGui, qimagereader.h)
    587 QT_CLASS_LIB(QImageWriter, QtGui, qimagewriter.h)
    588 QT_CLASS_LIB(QMovie, QtGui, qmovie.h)
    589 QT_CLASS_LIB(QPicture, QtGui, qpicture.h)
    590 QT_CLASS_LIB(QPictureIO, QtGui, qpicture.h)
    591 QT_CLASS_LIB(QPictureFormatInterface, QtGui, qpictureformatplugin.h)
    592 QT_CLASS_LIB(QPictureFormatPlugin, QtGui, qpictureformatplugin.h)
    593 QT_CLASS_LIB(QPixmap, QtGui, qpixmap.h)
    594 QT_CLASS_LIB(QPixmapCache, QtGui, qpixmapcache.h)
    595 QT_CLASS_LIB(QS60MainApplication, QtGui, qs60mainapplication.h)
    596 QT_CLASS_LIB(QS60MainAppUi, QtGui, qs60mainappui.h)
    597 QT_CLASS_LIB(QS60MainDocument, QtGui, qs60maindocument.h)
     605QT_CLASS_LIB(QMYSQLResult, QtSql, qsql_mysql.h)
     606QT_CLASS_LIB(QMYSQLDriver, QtSql, qsql_mysql.h)
     607QT_CLASS_LIB(QAbstractPageSetupDialog, QtGui, qabstractpagesetupdialog.h)
     608QT_CLASS_LIB(QAbstractPrintDialog, QtGui, qabstractprintdialog.h)
     609QT_CLASS_LIB(QColorDialog, QtGui, qcolordialog.h)
     610QT_CLASS_LIB(QDialog, QtGui, qdialog.h)
     611QT_CLASS_LIB(QErrorMessage, QtGui, qerrormessage.h)
     612QT_CLASS_LIB(QFileDialog, QtGui, qfiledialog.h)
     613QT_CLASS_LIB(QFileSystemModel, QtGui, qfilesystemmodel.h)
     614QT_CLASS_LIB(QFontDialog, QtGui, qfontdialog.h)
     615QT_CLASS_LIB(QInputDialog, QtGui, qinputdialog.h)
     616QT_CLASS_LIB(QMessageBox, QtGui, qmessagebox.h)
     617QT_CLASS_LIB(QPageSetupDialog, QtGui, qpagesetupdialog.h)
     618QT_CLASS_LIB(QUnixPrintWidget, QtGui, qprintdialog.h)
     619QT_CLASS_LIB(QPrintDialog, QtGui, qprintdialog.h)
     620QT_CLASS_LIB(QPrintPreviewDialog, QtGui, qprintpreviewdialog.h)
     621QT_CLASS_LIB(QProgressDialog, QtGui, qprogressdialog.h)
     622QT_CLASS_LIB(QWizard, QtGui, qwizard.h)
     623QT_CLASS_LIB(QWizardPage, QtGui, qwizard.h)
    598624QT_CLASS_LIB(QCopChannel, QtGui, qcopchannel_qws.h)
    599625QT_CLASS_LIB(QDecorationAction, QtGui, qdecoration_qws.h)
    … …  
    665691QT_CLASS_LIB(QWSSocket, QtGui, qwssocket_qws.h)
    666692QT_CLASS_LIB(QWSServerSocket, QtGui, qwssocket_qws.h)
    667 QT_CLASS_LIB(QAbstractButton, QtGui, qabstractbutton.h)
    668 QT_CLASS_LIB(QAbstractScrollArea, QtGui, qabstractscrollarea.h)
    669 QT_CLASS_LIB(QAbstractSlider, QtGui, qabstractslider.h)
    670 QT_CLASS_LIB(QAbstractSpinBox, QtGui, qabstractspinbox.h)
    671 QT_CLASS_LIB(QButtonGroup, QtGui, qbuttongroup.h)
    672 QT_CLASS_LIB(QCalendarWidget, QtGui, qcalendarwidget.h)
    673 QT_CLASS_LIB(QCheckBox, QtGui, qcheckbox.h)
    674 QT_CLASS_LIB(QComboBox, QtGui, qcombobox.h)
    675 QT_CLASS_LIB(QCommandLinkButton, QtGui, qcommandlinkbutton.h)
    676 QT_CLASS_LIB(QDateTimeEdit, QtGui, qdatetimeedit.h)
    677 QT_CLASS_LIB(QTimeEdit, QtGui, qdatetimeedit.h)
    678 QT_CLASS_LIB(QDateEdit, QtGui, qdatetimeedit.h)
    679 QT_CLASS_LIB(QDial, QtGui, qdial.h)
    680 QT_CLASS_LIB(QDialogButtonBox, QtGui, qdialogbuttonbox.h)
    681 QT_CLASS_LIB(QDockWidget, QtGui, qdockwidget.h)
    682 QT_CLASS_LIB(QFocusFrame, QtGui, qfocusframe.h)
    683 QT_CLASS_LIB(QFontComboBox, QtGui, qfontcombobox.h)
    684 QT_CLASS_LIB(QFrame, QtGui, qframe.h)
    685 QT_CLASS_LIB(QGroupBox, QtGui, qgroupbox.h)
    686 QT_CLASS_LIB(QLabel, QtGui, qlabel.h)
    687 QT_CLASS_LIB(QLCDNumber, QtGui, qlcdnumber.h)
    688 QT_CLASS_LIB(QLineEdit, QtGui, qlineedit.h)
    689 QT_CLASS_LIB(QMacCocoaViewContainer, QtGui, qmaccocoaviewcontainer_mac.h)
    690 QT_CLASS_LIB(QMacNativeWidget, QtGui, qmacnativewidget_mac.h)
    691 QT_CLASS_LIB(QMainWindow, QtGui, qmainwindow.h)
    692 QT_CLASS_LIB(QMdiArea, QtGui, qmdiarea.h)
    693 QT_CLASS_LIB(QMdiSubWindow, QtGui, qmdisubwindow.h)
    694 QT_CLASS_LIB(QMenu, QtGui, qmenu.h)
    695 QT_CLASS_LIB(QMenuBar, QtGui, qmenubar.h)
    696 QT_CLASS_LIB(QMenuItem, QtGui, qmenudata.h)
    697 QT_CLASS_LIB(QPlainTextEdit, QtGui, qplaintextedit.h)
    698 QT_CLASS_LIB(QPlainTextDocumentLayout, QtGui, qplaintextedit.h)
    699 QT_CLASS_LIB(QPrintPreviewWidget, QtGui, qprintpreviewwidget.h)
    700 QT_CLASS_LIB(QProgressBar, QtGui, qprogressbar.h)
    701 QT_CLASS_LIB(QPushButton, QtGui, qpushbutton.h)
    702 QT_CLASS_LIB(QRadioButton, QtGui, qradiobutton.h)
    703 QT_CLASS_LIB(QRubberBand, QtGui, qrubberband.h)
    704 QT_CLASS_LIB(QScrollArea, QtGui, qscrollarea.h)
    705 QT_CLASS_LIB(QScrollBar, QtGui, qscrollbar.h)
    706 QT_CLASS_LIB(QSizeGrip, QtGui, qsizegrip.h)
    707 QT_CLASS_LIB(QSlider, QtGui, qslider.h)
    708 QT_CLASS_LIB(QSpinBox, QtGui, qspinbox.h)
    709 QT_CLASS_LIB(QDoubleSpinBox, QtGui, qspinbox.h)
    710 QT_CLASS_LIB(QSplashScreen, QtGui, qsplashscreen.h)
    711 QT_CLASS_LIB(QSplitter, QtGui, qsplitter.h)
    712 QT_CLASS_LIB(QSplitterHandle, QtGui, qsplitter.h)
    713 QT_CLASS_LIB(QStackedWidget, QtGui, qstackedwidget.h)
    714 QT_CLASS_LIB(QStatusBar, QtGui, qstatusbar.h)
    715 QT_CLASS_LIB(QTabBar, QtGui, qtabbar.h)
    716 QT_CLASS_LIB(QTabWidget, QtGui, qtabwidget.h)
    717 QT_CLASS_LIB(QTextBrowser, QtGui, qtextbrowser.h)
    718 QT_CLASS_LIB(QTextEdit, QtGui, qtextedit.h)
    719 QT_CLASS_LIB(QToolBar, QtGui, qtoolbar.h)
    720 QT_CLASS_LIB(QToolBox, QtGui, qtoolbox.h)
    721 QT_CLASS_LIB(QToolButton, QtGui, qtoolbutton.h)
    722 QT_CLASS_LIB(QValidator, QtGui, qvalidator.h)
    723 QT_CLASS_LIB(QIntValidator, QtGui, qvalidator.h)
    724 QT_CLASS_LIB(QDoubleValidator, QtGui, qvalidator.h)
    725 QT_CLASS_LIB(QRegExpValidator, QtGui, qvalidator.h)
    726 QT_CLASS_LIB(QWorkspace, QtGui, qworkspace.h)
    727 QT_CLASS_LIB(QInputContext, QtGui, qinputcontext.h)
    728 QT_CLASS_LIB(QInputContextFactory, QtGui, qinputcontextfactory.h)
    729 QT_CLASS_LIB(QInputContextFactoryInterface, QtGui, qinputcontextplugin.h)
    730 QT_CLASS_LIB(QInputContextPlugin, QtGui, qinputcontextplugin.h)
    731693QT_CLASS_LIB(QGraphicsAnchor, QtGui, qgraphicsanchorlayout.h)
    732694QT_CLASS_LIB(QGraphicsAnchorLayout, QtGui, qgraphicsanchorlayout.h)
    … …  
    764726QT_CLASS_LIB(QGraphicsView, QtGui, qgraphicsview.h)
    765727QT_CLASS_LIB(QGraphicsWidget, QtGui, qgraphicswidget.h)
    766 QT_CLASS_LIB(QGenericMatrix, QtGui, qgenericmatrix.h)
    767 QT_CLASS_LIB(QMatrix2x2, QtGui, qgenericmatrix.h)
    768 QT_CLASS_LIB(QMatrix2x3, QtGui, qgenericmatrix.h)
    769 QT_CLASS_LIB(QMatrix2x4, QtGui, qgenericmatrix.h)
    770 QT_CLASS_LIB(QMatrix3x2, QtGui, qgenericmatrix.h)
    771 QT_CLASS_LIB(QMatrix3x3, QtGui, qgenericmatrix.h)
    772 QT_CLASS_LIB(QMatrix3x4, QtGui, qgenericmatrix.h)
    773 QT_CLASS_LIB(QMatrix4x2, QtGui, qgenericmatrix.h)
    774 QT_CLASS_LIB(QMatrix4x3, QtGui, qgenericmatrix.h)
    775 QT_CLASS_LIB(QMatrix4x4, QtGui, qmatrix4x4.h)
    776 QT_CLASS_LIB(QQuaternion, QtGui, qquaternion.h)
    777 QT_CLASS_LIB(QVector2D, QtGui, qvector2d.h)
    778 QT_CLASS_LIB(QVector3D, QtGui, qvector3d.h)
    779 QT_CLASS_LIB(QVector4D, QtGui, qvector4d.h)
    780 QT_CLASS_LIB(QFontEngineInfo, QtGui, qabstractfontengine_qws.h)
    781 QT_CLASS_LIB(QFontEngineFactoryInterface, QtGui, qabstractfontengine_qws.h)
    782 QT_CLASS_LIB(QFontEnginePlugin, QtGui, qabstractfontengine_qws.h)
    783 QT_CLASS_LIB(QAbstractFontEngine, QtGui, qabstractfontengine_qws.h)
    784 QT_CLASS_LIB(QAbstractTextDocumentLayout, QtGui, qabstracttextdocumentlayout.h)
    785 QT_CLASS_LIB(QTextObjectInterface, QtGui, qabstracttextdocumentlayout.h)
    786 QT_CLASS_LIB(QFont, QtGui, qfont.h)
    787 QT_CLASS_LIB(QFontDatabase, QtGui, qfontdatabase.h)
    788 QT_CLASS_LIB(QFontInfo, QtGui, qfontinfo.h)
    789 QT_CLASS_LIB(QFontMetrics, QtGui, qfontmetrics.h)
    790 QT_CLASS_LIB(QFontMetricsF, QtGui, qfontmetrics.h)
    791 QT_CLASS_LIB(QSyntaxHighlighter, QtGui, qsyntaxhighlighter.h)
    792 QT_CLASS_LIB(QTextCursor, QtGui, qtextcursor.h)
    793 QT_CLASS_LIB(QAbstractUndoItem, QtGui, qtextdocument.h)
    794 QT_CLASS_LIB(QTextDocument, QtGui, qtextdocument.h)
    795 QT_CLASS_LIB(QTextDocumentFragment, QtGui, qtextdocumentfragment.h)
    796 QT_CLASS_LIB(QTextDocumentWriter, QtGui, qtextdocumentwriter.h)
    797 QT_CLASS_LIB(QTextLength, QtGui, qtextformat.h)
    798 QT_CLASS_LIB(QTextFormat, QtGui, qtextformat.h)
    799 QT_CLASS_LIB(QTextCharFormat, QtGui, qtextformat.h)
    800 QT_CLASS_LIB(QTextBlockFormat, QtGui, qtextformat.h)
    801 QT_CLASS_LIB(QTextListFormat, QtGui, qtextformat.h)
    802 QT_CLASS_LIB(QTextImageFormat, QtGui, qtextformat.h)
    803 QT_CLASS_LIB(QTextFrameFormat, QtGui, qtextformat.h)
    804 QT_CLASS_LIB(QTextTableFormat, QtGui, qtextformat.h)
    805 QT_CLASS_LIB(QTextTableCellFormat, QtGui, qtextformat.h)
    806 QT_CLASS_LIB(QTextInlineObject, QtGui, qtextlayout.h)
    807 QT_CLASS_LIB(QTextLayout, QtGui, qtextlayout.h)
    808 QT_CLASS_LIB(QTextLine, QtGui, qtextlayout.h)
    809 QT_CLASS_LIB(QTextList, QtGui, qtextlist.h)
    810 QT_CLASS_LIB(QTextObject, QtGui, qtextobject.h)
    811 QT_CLASS_LIB(QTextBlockGroup, QtGui, qtextobject.h)
    812 QT_CLASS_LIB(QTextFrameLayoutData, QtGui, qtextobject.h)
    813 QT_CLASS_LIB(QTextFrame, QtGui, qtextobject.h)
    814 QT_CLASS_LIB(QTextBlockUserData, QtGui, qtextobject.h)
    815 QT_CLASS_LIB(QTextBlock, QtGui, qtextobject.h)
    816 QT_CLASS_LIB(QTextFragment, QtGui, qtextobject.h)
    817 QT_CLASS_LIB(QTextOption, QtGui, qtextoption.h)
    818 QT_CLASS_LIB(QTextTableCell, QtGui, qtexttable.h)
    819 QT_CLASS_LIB(QTextTable, QtGui, qtexttable.h)
    820 QT_CLASS_LIB(QAbstractPageSetupDialog, QtGui, qabstractpagesetupdialog.h)
    821 QT_CLASS_LIB(QAbstractPrintDialog, QtGui, qabstractprintdialog.h)
    822 QT_CLASS_LIB(QColorDialog, QtGui, qcolordialog.h)
    823 QT_CLASS_LIB(QDialog, QtGui, qdialog.h)
    824 QT_CLASS_LIB(QErrorMessage, QtGui, qerrormessage.h)
    825 QT_CLASS_LIB(QFileDialog, QtGui, qfiledialog.h)
    826 QT_CLASS_LIB(QFileSystemModel, QtGui, qfilesystemmodel.h)
    827 QT_CLASS_LIB(QFontDialog, QtGui, qfontdialog.h)
    828 QT_CLASS_LIB(QInputDialog, QtGui, qinputdialog.h)
    829 QT_CLASS_LIB(QMessageBox, QtGui, qmessagebox.h)
    830 QT_CLASS_LIB(QPageSetupDialog, QtGui, qpagesetupdialog.h)
    831 QT_CLASS_LIB(QUnixPrintWidget, QtGui, qprintdialog.h)
    832 QT_CLASS_LIB(QPrintDialog, QtGui, qprintdialog.h)
    833 QT_CLASS_LIB(QPrintPreviewDialog, QtGui, qprintpreviewdialog.h)
    834 QT_CLASS_LIB(QProgressDialog, QtGui, qprogressdialog.h)
    835 QT_CLASS_LIB(QWizard, QtGui, qwizard.h)
    836 QT_CLASS_LIB(QWizardPage, QtGui, qwizard.h)
    837 QT_CLASS_LIB(QAccessible, QtGui, qaccessible.h)
    838 QT_CLASS_LIB(QAccessibleInterface, QtGui, qaccessible.h)
    839 QT_CLASS_LIB(QAccessibleInterfaceEx, QtGui, qaccessible.h)
    840 QT_CLASS_LIB(QAccessibleEvent, QtGui, qaccessible.h)
    841 QT_CLASS_LIB(QAccessible2Interface, QtGui, qaccessible2.h)
    842 QT_CLASS_LIB(QAccessibleTextInterface, QtGui, qaccessible2.h)
    843 QT_CLASS_LIB(QAccessibleEditableTextInterface, QtGui, qaccessible2.h)
    844 QT_CLASS_LIB(QAccessibleSimpleEditableTextInterface, QtGui, qaccessible2.h)
    845 QT_CLASS_LIB(QAccessibleValueInterface, QtGui, qaccessible2.h)
    846 QT_CLASS_LIB(QAccessibleTableInterface, QtGui, qaccessible2.h)
    847 QT_CLASS_LIB(QAccessibleActionInterface, QtGui, qaccessible2.h)
    848 QT_CLASS_LIB(QAccessibleImageInterface, QtGui, qaccessible2.h)
    849 QT_CLASS_LIB(QAccessibleBridge, QtGui, qaccessiblebridge.h)
    850 QT_CLASS_LIB(QAccessibleBridgeFactoryInterface, QtGui, qaccessiblebridge.h)
    851 QT_CLASS_LIB(QAccessibleBridgePlugin, QtGui, qaccessiblebridge.h)
    852 QT_CLASS_LIB(QAccessibleObject, QtGui, qaccessibleobject.h)
    853 QT_CLASS_LIB(QAccessibleObjectEx, QtGui, qaccessibleobject.h)
    854 QT_CLASS_LIB(QAccessibleApplication, QtGui, qaccessibleobject.h)
    855 QT_CLASS_LIB(QAccessibleFactoryInterface, QtGui, qaccessibleplugin.h)
    856 QT_CLASS_LIB(QAccessiblePlugin, QtGui, qaccessibleplugin.h)
    857 QT_CLASS_LIB(QAccessibleWidget, QtGui, qaccessiblewidget.h)
    858 QT_CLASS_LIB(QAccessibleWidgetEx, QtGui, qaccessiblewidget.h)
    859728QT_CLASS_LIB(QAction, QtGui, qaction.h)
    860729QT_CLASS_LIB(QActionGroup, QtGui, qactiongroup.h)
    … …  
    943812QT_CLASS_LIB(QX11EmbedContainer, QtGui, qx11embed_x11.h)
    944813QT_CLASS_LIB(QX11Info, QtGui, qx11info_x11.h)
     814QT_CLASS_LIB(QGraphicsEffect, QtGui, qgraphicseffect.h)
     815QT_CLASS_LIB(QGraphicsColorizeEffect, QtGui, qgraphicseffect.h)
     816QT_CLASS_LIB(QGraphicsBlurEffect, QtGui, qgraphicseffect.h)
     817QT_CLASS_LIB(QGraphicsDropShadowEffect, QtGui, qgraphicseffect.h)
     818QT_CLASS_LIB(QGraphicsOpacityEffect, QtGui, qgraphicseffect.h)
     819QT_CLASS_LIB(QS60MainApplicationBase, QtGui, qs60mainapplication.h)
     820QT_CLASS_LIB(QS60MainApplicationBase, QtGui, qs60mainapplication.h)
     821QT_CLASS_LIB(QS60MainApplication, QtGui, qs60mainapplication.h)
     822QT_CLASS_LIB(QS60MainAppUiBase, QtGui, qs60mainappui.h)
     823QT_CLASS_LIB(QS60StubAknAppUiBase, QtGui, qs60mainappui.h)
     824QT_CLASS_LIB(QS60StubMEikStatusPaneObserver, QtGui, qs60mainappui.h)
     825QT_CLASS_LIB(QS60StubMAknTouchPaneObserver, QtGui, qs60mainappui.h)
     826QT_CLASS_LIB(QS60StubAknAppUi, QtGui, qs60mainappui.h)
     827QT_CLASS_LIB(QS60MainAppUiBase, QtGui, qs60mainappui.h)
     828QT_CLASS_LIB(QS60MainAppUi, QtGui, qs60mainappui.h)
     829QT_CLASS_LIB(QS60MainDocumentBase, QtGui, qs60maindocument.h)
     830QT_CLASS_LIB(QS60MainDocumentBase, QtGui, qs60maindocument.h)
     831QT_CLASS_LIB(QS60MainDocument, QtGui, qs60maindocument.h)
     832QT_CLASS_LIB(QGenericMatrix, QtGui, qgenericmatrix.h)
     833QT_CLASS_LIB(QMatrix2x2, QtGui, qgenericmatrix.h)
     834QT_CLASS_LIB(QMatrix2x3, QtGui, qgenericmatrix.h)
     835QT_CLASS_LIB(QMatrix2x4, QtGui, qgenericmatrix.h)
     836QT_CLASS_LIB(QMatrix3x2, QtGui, qgenericmatrix.h)
     837QT_CLASS_LIB(QMatrix3x3, QtGui, qgenericmatrix.h)
     838QT_CLASS_LIB(QMatrix3x4, QtGui, qgenericmatrix.h)
     839QT_CLASS_LIB(QMatrix4x2, QtGui, qgenericmatrix.h)
     840QT_CLASS_LIB(QMatrix4x3, QtGui, qgenericmatrix.h)
     841QT_CLASS_LIB(QMatrix4x4, QtGui, qmatrix4x4.h)
     842QT_CLASS_LIB(QQuaternion, QtGui, qquaternion.h)
     843QT_CLASS_LIB(QVector2D, QtGui, qvector2d.h)
     844QT_CLASS_LIB(QVector3D, QtGui, qvector3d.h)
     845QT_CLASS_LIB(QVector4D, QtGui, qvector4d.h)
     846QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h)
     847QT_CLASS_LIB(QIcon, QtGui, qicon.h)
     848QT_CLASS_LIB(QIconSet, QtGui, qicon.h)
     849QT_CLASS_LIB(QIconEngine, QtGui, qiconengine.h)
     850QT_CLASS_LIB(QIconEngineV2, QtGui, qiconengine.h)
     851QT_CLASS_LIB(QIconEngineFactoryInterface, QtGui, qiconengineplugin.h)
     852QT_CLASS_LIB(QIconEnginePlugin, QtGui, qiconengineplugin.h)
     853QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtGui, qiconengineplugin.h)
     854QT_CLASS_LIB(QIconEnginePluginV2, QtGui, qiconengineplugin.h)
     855QT_CLASS_LIB(QImageTextKeyLang, QtGui, qimage.h)
     856QT_CLASS_LIB(QImage, QtGui, qimage.h)
     857QT_CLASS_LIB(QImageIOHandler, QtGui, qimageiohandler.h)
     858QT_CLASS_LIB(QImageIOHandlerFactoryInterface, QtGui, qimageiohandler.h)
     859QT_CLASS_LIB(QImageIOPlugin, QtGui, qimageiohandler.h)
     860QT_CLASS_LIB(QImageReader, QtGui, qimagereader.h)
     861QT_CLASS_LIB(QImageWriter, QtGui, qimagewriter.h)
     862QT_CLASS_LIB(QMovie, QtGui, qmovie.h)
     863QT_CLASS_LIB(QPicture, QtGui, qpicture.h)
     864QT_CLASS_LIB(QPictureIO, QtGui, qpicture.h)
     865QT_CLASS_LIB(QPictureFormatInterface, QtGui, qpictureformatplugin.h)
     866QT_CLASS_LIB(QPictureFormatPlugin, QtGui, qpictureformatplugin.h)
     867QT_CLASS_LIB(QPixmap, QtGui, qpixmap.h)
     868QT_CLASS_LIB(QPixmapCache, QtGui, qpixmapcache.h)
     869QT_CLASS_LIB(QSymbianEvent, QtGui, qsymbianevent.h)
     870QT_CLASS_LIB(QFontEngineInfo, QtGui, qabstractfontengine_qws.h)
     871QT_CLASS_LIB(QFontEngineFactoryInterface, QtGui, qabstractfontengine_qws.h)
     872QT_CLASS_LIB(QFontEnginePlugin, QtGui, qabstractfontengine_qws.h)
     873QT_CLASS_LIB(QAbstractFontEngine, QtGui, qabstractfontengine_qws.h)
     874QT_CLASS_LIB(QAbstractTextDocumentLayout, QtGui, qabstracttextdocumentlayout.h)
     875QT_CLASS_LIB(QTextObjectInterface, QtGui, qabstracttextdocumentlayout.h)
     876QT_CLASS_LIB(QFont, QtGui, qfont.h)
     877QT_CLASS_LIB(QFontDatabase, QtGui, qfontdatabase.h)
     878QT_CLASS_LIB(QFontInfo, QtGui, qfontinfo.h)
     879QT_CLASS_LIB(QFontMetrics, QtGui, qfontmetrics.h)
     880QT_CLASS_LIB(QFontMetricsF, QtGui, qfontmetrics.h)
     881QT_CLASS_LIB(QStaticText, QtGui, qstatictext.h)
     882QT_CLASS_LIB(QSyntaxHighlighter, QtGui, qsyntaxhighlighter.h)
     883QT_CLASS_LIB(QTextCursor, QtGui, qtextcursor.h)
     884QT_CLASS_LIB(QAbstractUndoItem, QtGui, qtextdocument.h)
     885QT_CLASS_LIB(QTextDocument, QtGui, qtextdocument.h)
     886QT_CLASS_LIB(QTextDocumentFragment, QtGui, qtextdocumentfragment.h)
     887QT_CLASS_LIB(QTextDocumentWriter, QtGui, qtextdocumentwriter.h)
     888QT_CLASS_LIB(QTextLength, QtGui, qtextformat.h)
     889QT_CLASS_LIB(QTextFormat, QtGui, qtextformat.h)
     890QT_CLASS_LIB(QTextCharFormat, QtGui, qtextformat.h)
     891QT_CLASS_LIB(QTextBlockFormat, QtGui, qtextformat.h)
     892QT_CLASS_LIB(QTextListFormat, QtGui, qtextformat.h)
     893QT_CLASS_LIB(QTextImageFormat, QtGui, qtextformat.h)
     894QT_CLASS_LIB(QTextFrameFormat, QtGui, qtextformat.h)
     895QT_CLASS_LIB(QTextTableFormat, QtGui, qtextformat.h)
     896QT_CLASS_LIB(QTextTableCellFormat, QtGui, qtextformat.h)
     897QT_CLASS_LIB(QTextInlineObject, QtGui, qtextlayout.h)
     898QT_CLASS_LIB(QTextLayout, QtGui, qtextlayout.h)
     899QT_CLASS_LIB(QTextLine, QtGui, qtextlayout.h)
     900QT_CLASS_LIB(QTextList, QtGui, qtextlist.h)
     901QT_CLASS_LIB(QTextObject, QtGui, qtextobject.h)
     902QT_CLASS_LIB(QTextBlockGroup, QtGui, qtextobject.h)
     903QT_CLASS_LIB(QTextFrameLayoutData, QtGui, qtextobject.h)
     904QT_CLASS_LIB(QTextFrame, QtGui, qtextobject.h)
     905QT_CLASS_LIB(QTextBlockUserData, QtGui, qtextobject.h)
     906QT_CLASS_LIB(QTextBlock, QtGui, qtextobject.h)
     907QT_CLASS_LIB(QTextFragment, QtGui, qtextobject.h)
     908QT_CLASS_LIB(QTextOption, QtGui, qtextoption.h)
     909QT_CLASS_LIB(QTextTableCell, QtGui, qtexttable.h)
     910QT_CLASS_LIB(QTextTable, QtGui, qtexttable.h)
    945911QT_CLASS_LIB(QAbstractItemDelegate, QtGui, qabstractitemdelegate.h)
    946912QT_CLASS_LIB(QAbstractItemView, QtGui, qabstractitemview.h)
    … …  
    976942QT_CLASS_LIB(QTreeWidget, QtGui, qtreewidget.h)
    977943QT_CLASS_LIB(QTreeWidgetItemIterator, QtGui, qtreewidgetitemiterator.h)
    978 QT_CLASS_LIB(QBrush, QtGui, qbrush.h)
    979 QT_CLASS_LIB(QBrushData, QtGui, qbrush.h)
    980 QT_CLASS_LIB(QGradientStop, QtGui, qbrush.h)
    981 QT_CLASS_LIB(QGradientStops, QtGui, qbrush.h)
    982 QT_CLASS_LIB(QGradient, QtGui, qbrush.h)
    983 QT_CLASS_LIB(QLinearGradient, QtGui, qbrush.h)
    984 QT_CLASS_LIB(QRadialGradient, QtGui, qbrush.h)
    985 QT_CLASS_LIB(QConicalGradient, QtGui, qbrush.h)
    986 QT_CLASS_LIB(QColor, QtGui, qcolor.h)
    987 QT_CLASS_LIB(QColormap, QtGui, qcolormap.h)
    988 QT_CLASS_LIB(QTileRules, QtGui, qdrawutil.h)
    989 QT_CLASS_LIB(QMatrix, QtGui, qmatrix.h)
    990 QT_CLASS_LIB(QPaintDevice, QtGui, qpaintdevice.h)
    991 QT_CLASS_LIB(QTextItem, QtGui, qpaintengine.h)
    992 QT_CLASS_LIB(QPaintEngine, QtGui, qpaintengine.h)
    993 QT_CLASS_LIB(QPaintEngineState, QtGui, qpaintengine.h)
    994 QT_CLASS_LIB(QPainter, QtGui, qpainter.h)
    995 QT_CLASS_LIB(QPainterPath, QtGui, qpainterpath.h)
    996 QT_CLASS_LIB(QPainterPathPrivate, QtGui, qpainterpath.h)
    997 QT_CLASS_LIB(QPainterPathStroker, QtGui, qpainterpath.h)
    998 QT_CLASS_LIB(QPen, QtGui, qpen.h)
    999 QT_CLASS_LIB(QPolygon, QtGui, qpolygon.h)
    1000 QT_CLASS_LIB(QPolygonF, QtGui, qpolygon.h)
    1001 QT_CLASS_LIB(QPrintEngine, QtGui, qprintengine.h)
    1002 QT_CLASS_LIB(QPrinter, QtGui, qprinter.h)
    1003 QT_CLASS_LIB(QPrinterInfo, QtGui, qprinterinfo.h)
    1004 QT_CLASS_LIB(QRegion, QtGui, qregion.h)
    1005 QT_CLASS_LIB(QRgb, QtGui, qrgb.h)
    1006 QT_CLASS_LIB(QStylePainter, QtGui, qstylepainter.h)
    1007 QT_CLASS_LIB(QTransform, QtGui, qtransform.h)
    1008 QT_CLASS_LIB(QWMatrix, QtGui, qwmatrix.h)
    1009 QT_CLASS_LIB(QSymbianEvent, QtGui, qsymbianevent.h)
     944QT_CLASS_LIB(QAbstractButton, QtGui, qabstractbutton.h)
     945QT_CLASS_LIB(QAbstractScrollArea, QtGui, qabstractscrollarea.h)
     946QT_CLASS_LIB(QAbstractSlider, QtGui, qabstractslider.h)
     947QT_CLASS_LIB(QAbstractSpinBox, QtGui, qabstractspinbox.h)
     948QT_CLASS_LIB(QButtonGroup, QtGui, qbuttongroup.h)
     949QT_CLASS_LIB(QCalendarWidget, QtGui, qcalendarwidget.h)
     950QT_CLASS_LIB(QCheckBox, QtGui, qcheckbox.h)
     951QT_CLASS_LIB(QComboBox, QtGui, qcombobox.h)
     952QT_CLASS_LIB(QCommandLinkButton, QtGui, qcommandlinkbutton.h)
     953QT_CLASS_LIB(QDateTimeEdit, QtGui, qdatetimeedit.h)
     954QT_CLASS_LIB(QTimeEdit, QtGui, qdatetimeedit.h)
     955QT_CLASS_LIB(QDateEdit, QtGui, qdatetimeedit.h)
     956QT_CLASS_LIB(QDial, QtGui, qdial.h)
     957QT_CLASS_LIB(QDialogButtonBox, QtGui, qdialogbuttonbox.h)
     958QT_CLASS_LIB(QDockWidget, QtGui, qdockwidget.h)
     959QT_CLASS_LIB(QFocusFrame, QtGui, qfocusframe.h)
     960QT_CLASS_LIB(QFontComboBox, QtGui, qfontcombobox.h)
     961QT_CLASS_LIB(QFrame, QtGui, qframe.h)
     962QT_CLASS_LIB(QGroupBox, QtGui, qgroupbox.h)
     963QT_CLASS_LIB(QLabel, QtGui, qlabel.h)
     964QT_CLASS_LIB(QLCDNumber, QtGui, qlcdnumber.h)
     965QT_CLASS_LIB(QLineEdit, QtGui, qlineedit.h)
     966QT_CLASS_LIB(QMacCocoaViewContainer, QtGui, qmaccocoaviewcontainer_mac.h)
     967QT_CLASS_LIB(QMacNativeWidget, QtGui, qmacnativewidget_mac.h)
     968QT_CLASS_LIB(QMainWindow, QtGui, qmainwindow.h)
     969QT_CLASS_LIB(QMdiArea, QtGui, qmdiarea.h)
     970QT_CLASS_LIB(QMdiSubWindow, QtGui, qmdisubwindow.h)
     971QT_CLASS_LIB(QMenu, QtGui, qmenu.h)
     972QT_CLASS_LIB(QMenuBar, QtGui, qmenubar.h)
     973QT_CLASS_LIB(QMenuItem, QtGui, qmenudata.h)
     974QT_CLASS_LIB(QPlainTextEdit, QtGui, qplaintextedit.h)
     975QT_CLASS_LIB(QPlainTextDocumentLayout, QtGui, qplaintextedit.h)
     976QT_CLASS_LIB(QPrintPreviewWidget, QtGui, qprintpreviewwidget.h)
     977QT_CLASS_LIB(QProgressBar, QtGui, qprogressbar.h)
     978QT_CLASS_LIB(QPushButton, QtGui, qpushbutton.h)
     979QT_CLASS_LIB(QRadioButton, QtGui, qradiobutton.h)
     980QT_CLASS_LIB(QRubberBand, QtGui, qrubberband.h)
     981QT_CLASS_LIB(QScrollArea, QtGui, qscrollarea.h)
     982QT_CLASS_LIB(QScrollBar, QtGui, qscrollbar.h)
     983QT_CLASS_LIB(QSizeGrip, QtGui, qsizegrip.h)
     984QT_CLASS_LIB(QSlider, QtGui, qslider.h)
     985QT_CLASS_LIB(QSpinBox, QtGui, qspinbox.h)
     986QT_CLASS_LIB(QDoubleSpinBox, QtGui, qspinbox.h)
     987QT_CLASS_LIB(QSplashScreen, QtGui, qsplashscreen.h)
     988QT_CLASS_LIB(QSplitter, QtGui, qsplitter.h)
     989QT_CLASS_LIB(QSplitterHandle, QtGui, qsplitter.h)
     990QT_CLASS_LIB(QStackedWidget, QtGui, qstackedwidget.h)
     991QT_CLASS_LIB(QStatusBar, QtGui, qstatusbar.h)
     992QT_CLASS_LIB(QTabBar, QtGui, qtabbar.h)
     993QT_CLASS_LIB(QTabWidget, QtGui, qtabwidget.h)
     994QT_CLASS_LIB(QTextBrowser, QtGui, qtextbrowser.h)
     995QT_CLASS_LIB(QTextEdit, QtGui, qtextedit.h)
     996QT_CLASS_LIB(QToolBar, QtGui, qtoolbar.h)
     997QT_CLASS_LIB(QToolBox, QtGui, qtoolbox.h)
     998QT_CLASS_LIB(QToolButton, QtGui, qtoolbutton.h)
     999QT_CLASS_LIB(QValidator, QtGui, qvalidator.h)
     1000QT_CLASS_LIB(QIntValidator, QtGui, qvalidator.h)
     1001QT_CLASS_LIB(QDoubleValidator, QtGui, qvalidator.h)
     1002QT_CLASS_LIB(QRegExpValidator, QtGui, qvalidator.h)
     1003QT_CLASS_LIB(QWorkspace, QtGui, qworkspace.h)
     1004QT_CLASS_LIB(QKeyEventTransition, QtGui, qkeyeventtransition.h)
     1005QT_CLASS_LIB(QMouseEventTransition, QtGui, qmouseeventtransition.h)
     1006QT_CLASS_LIB(QCompleter, QtGui, qcompleter.h)
     1007QT_CLASS_LIB(QDesktopServices, QtGui, qdesktopservices.h)
     1008QT_CLASS_LIB(QSystemTrayIcon, QtGui, qsystemtrayicon.h)
     1009QT_CLASS_LIB(QUndoGroup, QtGui, qundogroup.h)
     1010QT_CLASS_LIB(QUndoCommand, QtGui, qundostack.h)
     1011QT_CLASS_LIB(QUndoStack, QtGui, qundostack.h)
     1012QT_CLASS_LIB(QUndoView, QtGui, qundoview.h)
     1013QT_CLASS_LIB(QAccessible, QtGui, qaccessible.h)
     1014QT_CLASS_LIB(QAccessibleInterface, QtGui, qaccessible.h)
     1015QT_CLASS_LIB(QAccessibleInterfaceEx, QtGui, qaccessible.h)
     1016QT_CLASS_LIB(QAccessibleEvent, QtGui, qaccessible.h)
     1017QT_CLASS_LIB(QAccessible2Interface, QtGui, qaccessible2.h)
     1018QT_CLASS_LIB(QAccessibleTextInterface, QtGui, qaccessible2.h)
     1019QT_CLASS_LIB(QAccessibleEditableTextInterface, QtGui, qaccessible2.h)
     1020QT_CLASS_LIB(QAccessibleSimpleEditableTextInterface, QtGui, qaccessible2.h)
     1021QT_CLASS_LIB(QAccessibleValueInterface, QtGui, qaccessible2.h)
     1022QT_CLASS_LIB(QAccessibleTableInterface, QtGui, qaccessible2.h)
     1023QT_CLASS_LIB(QAccessibleActionInterface, QtGui, qaccessible2.h)
     1024QT_CLASS_LIB(QAccessibleImageInterface, QtGui, qaccessible2.h)
     1025QT_CLASS_LIB(QAccessibleBridge, QtGui, qaccessiblebridge.h)
     1026QT_CLASS_LIB(QAccessibleBridgeFactoryInterface, QtGui, qaccessiblebridge.h)
     1027QT_CLASS_LIB(QAccessibleBridgePlugin, QtGui, qaccessiblebridge.h)
     1028QT_CLASS_LIB(QAccessibleObject, QtGui, qaccessibleobject.h)
     1029QT_CLASS_LIB(QAccessibleObjectEx, QtGui, qaccessibleobject.h)
     1030QT_CLASS_LIB(QAccessibleApplication, QtGui, qaccessibleobject.h)
     1031QT_CLASS_LIB(QAccessibleFactoryInterface, QtGui, qaccessibleplugin.h)
     1032QT_CLASS_LIB(QAccessiblePlugin, QtGui, qaccessibleplugin.h)
     1033QT_CLASS_LIB(QAccessibleWidget, QtGui, qaccessiblewidget.h)
     1034QT_CLASS_LIB(QAccessibleWidgetEx, QtGui, qaccessiblewidget.h)
    10101035QT_CLASS_LIB(QCDEStyle, QtGui, qcdestyle.h)
    10111036QT_CLASS_LIB(QCleanlooksStyle, QtGui, qcleanlooksstyle.h)
    … …  
    10681093QT_CLASS_LIB(QWindowsVistaStyle, QtGui, qwindowsvistastyle.h)
    10691094QT_CLASS_LIB(QWindowsXPStyle, QtGui, qwindowsxpstyle.h)
    1070 QT_CLASS_LIB(QKeyEventTransition, QtGui, qkeyeventtransition.h)
    1071 QT_CLASS_LIB(QMouseEventTransition, QtGui, qmouseeventtransition.h)
    1072 QT_CLASS_LIB(QGraphicsEffect, QtGui, qgraphicseffect.h)
    1073 QT_CLASS_LIB(QGraphicsColorizeEffect, QtGui, qgraphicseffect.h)
    1074 QT_CLASS_LIB(QGraphicsBlurEffect, QtGui, qgraphicseffect.h)
    1075 QT_CLASS_LIB(QGraphicsDropShadowEffect, QtGui, qgraphicseffect.h)
    1076 QT_CLASS_LIB(QGraphicsOpacityEffect, QtGui, qgraphicseffect.h)
    1077 QT_CLASS_LIB(QCompleter, QtGui, qcompleter.h)
    1078 QT_CLASS_LIB(QDesktopServices, QtGui, qdesktopservices.h)
    1079 QT_CLASS_LIB(QSystemTrayIcon, QtGui, qsystemtrayicon.h)
    1080 QT_CLASS_LIB(QUndoGroup, QtGui, qundogroup.h)
    1081 QT_CLASS_LIB(QUndoCommand, QtGui, qundostack.h)
    1082 QT_CLASS_LIB(QUndoStack, QtGui, qundostack.h)
    1083 QT_CLASS_LIB(QUndoView, QtGui, qundoview.h)
     1095QT_CLASS_LIB(QInputContext, QtGui, qinputcontext.h)
     1096QT_CLASS_LIB(QInputContextFactory, QtGui, qinputcontextfactory.h)
     1097QT_CLASS_LIB(QInputContextFactoryInterface, QtGui, qinputcontextplugin.h)
     1098QT_CLASS_LIB(QInputContextPlugin, QtGui, qinputcontextplugin.h)
     1099QT_CLASS_LIB(QBrush, QtGui, qbrush.h)
     1100QT_CLASS_LIB(QBrushData, QtGui, qbrush.h)
     1101QT_CLASS_LIB(QGradientStop, QtGui, qbrush.h)
     1102QT_CLASS_LIB(QGradientStops, QtGui, qbrush.h)
     1103QT_CLASS_LIB(QGradient, QtGui, qbrush.h)
     1104QT_CLASS_LIB(QLinearGradient, QtGui, qbrush.h)
     1105QT_CLASS_LIB(QRadialGradient, QtGui, qbrush.h)
     1106QT_CLASS_LIB(QConicalGradient, QtGui, qbrush.h)
     1107QT_CLASS_LIB(QColor, QtGui, qcolor.h)
     1108QT_CLASS_LIB(QColormap, QtGui, qcolormap.h)
     1109QT_CLASS_LIB(QTileRules, QtGui, qdrawutil.h)
     1110QT_CLASS_LIB(QMatrix, QtGui, qmatrix.h)
     1111QT_CLASS_LIB(QPaintDevice, QtGui, qpaintdevice.h)
     1112QT_CLASS_LIB(QTextItem, QtGui, qpaintengine.h)
     1113QT_CLASS_LIB(QPaintEngine, QtGui, qpaintengine.h)
     1114QT_CLASS_LIB(QPaintEngineState, QtGui, qpaintengine.h)
     1115QT_CLASS_LIB(QPainter, QtGui, qpainter.h)
     1116QT_CLASS_LIB(QPainterPath, QtGui, qpainterpath.h)
     1117QT_CLASS_LIB(QPainterPathPrivate, QtGui, qpainterpath.h)
     1118QT_CLASS_LIB(QPainterPathStroker, QtGui, qpainterpath.h)
     1119QT_CLASS_LIB(QPen, QtGui, qpen.h)
     1120QT_CLASS_LIB(QPolygon, QtGui, qpolygon.h)
     1121QT_CLASS_LIB(QPolygonF, QtGui, qpolygon.h)
     1122QT_CLASS_LIB(QPrintEngine, QtGui, qprintengine.h)
     1123QT_CLASS_LIB(QPrinter, QtGui, qprinter.h)
     1124QT_CLASS_LIB(QPrinterInfo, QtGui, qprinterinfo.h)
     1125QT_CLASS_LIB(QRegion, QtGui, qregion.h)
     1126QT_CLASS_LIB(QRgb, QtGui, qrgb.h)
     1127QT_CLASS_LIB(QStylePainter, QtGui, qstylepainter.h)
     1128QT_CLASS_LIB(QTransform, QtGui, qtransform.h)
     1129QT_CLASS_LIB(QWMatrix, QtGui, qwmatrix.h)
    10841130QT_CLASS_LIB(QScriptEngineDebugger, QtScriptTools, qscriptenginedebugger.h)
    10851131QT_CLASS_LIB(QUiLoader, QtUiTools, quiloader.h)
    10861132QT_CLASS_LIB(QDesignerComponents, QtDesigner, qdesigner_components.h)
    1087 QT_CLASS_LIB(QExtensionFactory, QtDesigner, default_extensionfactory.h)
    1088 QT_CLASS_LIB(QAbstractExtensionFactory, QtDesigner, extension.h)
    1089 QT_CLASS_LIB(QAbstractExtensionManager, QtDesigner, extension.h)
    1090 QT_CLASS_LIB(QExtensionManager, QtDesigner, qextensionmanager.h)
    10911133QT_CLASS_LIB(QDesignerActionEditorInterface, QtDesigner, abstractactioneditor.h)
    10921134QT_CLASS_LIB(QDesignerBrushManagerInterface, QtDesigner, abstractbrushmanager.h)
    … …  
    11171159QT_CLASS_LIB(QDesignerPropertySheetExtension, QtDesigner, propertysheet.h)
    11181160QT_CLASS_LIB(QDesignerTaskMenuExtension, QtDesigner, taskmenu.h)
     1161QT_CLASS_LIB(QExtensionFactory, QtDesigner, default_extensionfactory.h)
     1162QT_CLASS_LIB(QAbstractExtensionFactory, QtDesigner, extension.h)
     1163QT_CLASS_LIB(QAbstractExtensionManager, QtDesigner, extension.h)
     1164QT_CLASS_LIB(QExtensionManager, QtDesigner, qextensionmanager.h)
    11191165QT_CLASS_LIB(QAbstractFormBuilder, QtDesigner, abstractformbuilder.h)
    11201166QT_CLASS_LIB(QDesignerContainerExtension, QtDesigner, container.h)
    … …  
    11271173QT_CLASS_LIB(Phonon::AbstractVideoOutput, phonon, abstractvideooutput.h)
    11281174QT_CLASS_LIB(Phonon::AddonInterface, phonon, addoninterface.h)
     1175QT_CLASS_LIB(Phonon::AudioDataOutput, phonon, audiodataoutput.h)
     1176QT_CLASS_LIB(Phonon::AudioDataOutputInterface, phonon, audiodataoutputinterface.h)
    11291177QT_CLASS_LIB(Phonon::AudioOutput, phonon, audiooutput.h)
    11301178QT_CLASS_LIB(Phonon::AudioOutputInterface40, phonon, audiooutputinterface.h)
    … …  
    11381186QT_CLASS_LIB(Phonon::EffectParameter, phonon, effectparameter.h)
    11391187QT_CLASS_LIB(Phonon::EffectWidget, phonon, effectwidget.h)
     1188QT_CLASS_LIB(Phonon::GlobalConfig, phonon, globalconfig.h)
    11401189QT_CLASS_LIB(Phonon::MediaController, phonon, mediacontroller.h)
    11411190QT_CLASS_LIB(Phonon::MediaNode, phonon, medianode.h)
    … …  
    11601209QT_CLASS_LIB(Phonon::Global, phonon, phononnamespace.h)
    11611210QT_CLASS_LIB(Phonon::PlatformPlugin, phonon, platformplugin.h)
     1211QT_CLASS_LIB(Phonon::PulseSupport, phonon, pulsesupport.h)
    11621212QT_CLASS_LIB(Phonon::SeekSlider, phonon, seekslider.h)
    11631213QT_CLASS_LIB(Phonon::StreamInterface, phonon, streaminterface.h)
    … …  
    11651215QT_CLASS_LIB(Phonon::VideoWidget, phonon, videowidget.h)
    11661216QT_CLASS_LIB(Phonon::VideoWidgetInterface, phonon, videowidgetinterface.h)
     1217QT_CLASS_LIB(Phonon::VideoWidgetInterface44, phonon, videowidgetinterface.h)
     1218QT_CLASS_LIB(Phonon::VideoWidgetInterfaceLatest, phonon, videowidgetinterface.h)
     1219QT_CLASS_LIB(Phonon::VideoWidgetInterfaceLatest, phonon, videowidgetinterface.h)
    11671220QT_CLASS_LIB(Phonon::VolumeFaderEffect, phonon, volumefadereffect.h)
    11681221QT_CLASS_LIB(Phonon::VolumeFaderInterface, phonon, volumefaderinterface.h)
    … …  
    11721225QT_CLASS_LIB(QSvgRenderer, QtSvg, qsvgrenderer.h)
    11731226QT_CLASS_LIB(QSvgWidget, QtSvg, qsvgwidget.h)
    1174 QT_CLASS_LIB(Q3Action, Qt3Support, q3action.h)
    1175 QT_CLASS_LIB(Q3ActionGroup, Qt3Support, q3action.h)
    1176 QT_CLASS_LIB(Q3Button, Qt3Support, q3button.h)
    1177 QT_CLASS_LIB(Q3ButtonGroup, Qt3Support, q3buttongroup.h)
    1178 QT_CLASS_LIB(Q3VButtonGroup, Qt3Support, q3buttongroup.h)
    1179 QT_CLASS_LIB(Q3HButtonGroup, Qt3Support, q3buttongroup.h)
    1180 QT_CLASS_LIB(Q3ComboBox, Qt3Support, q3combobox.h)
    1181 QT_CLASS_LIB(Q3DateTimeEditBase, Qt3Support, q3datetimeedit.h)
    1182 QT_CLASS_LIB(Q3DateEdit, Qt3Support, q3datetimeedit.h)
    1183 QT_CLASS_LIB(Q3TimeEdit, Qt3Support, q3datetimeedit.h)
    1184 QT_CLASS_LIB(Q3DateTimeEdit, Qt3Support, q3datetimeedit.h)
    1185 QT_CLASS_LIB(Q3DockAreaLayout, Qt3Support, q3dockarea.h)
    1186 QT_CLASS_LIB(Q3DockArea, Qt3Support, q3dockarea.h)
    1187 QT_CLASS_LIB(Q3DockWindow, Qt3Support, q3dockwindow.h)
    1188 QT_CLASS_LIB(Q3Frame, Qt3Support, q3frame.h)
    1189 QT_CLASS_LIB(Q3Grid, Qt3Support, q3grid.h)
    1190 QT_CLASS_LIB(Q3GridView, Qt3Support, q3gridview.h)
    1191 QT_CLASS_LIB(Q3GroupBox, Qt3Support, q3groupbox.h)
    1192 QT_CLASS_LIB(Q3HBox, Qt3Support, q3hbox.h)
    1193 QT_CLASS_LIB(Q3Header, Qt3Support, q3header.h)
    1194 QT_CLASS_LIB(Q3HGroupBox, Qt3Support, q3hgroupbox.h)
    1195 QT_CLASS_LIB(Q3MainWindow, Qt3Support, q3mainwindow.h)
    1196 QT_CLASS_LIB(Q3PopupMenu, Qt3Support, q3popupmenu.h)
    1197 QT_CLASS_LIB(Q3ProgressBar, Qt3Support, q3progressbar.h)
    1198 QT_CLASS_LIB(Q3RangeControl, Qt3Support, q3rangecontrol.h)
    1199 QT_CLASS_LIB(Q3SpinWidget, Qt3Support, q3rangecontrol.h)
    1200 QT_CLASS_LIB(Q3ScrollView, Qt3Support, q3scrollview.h)
    1201 QT_CLASS_LIB(Q3ToolBar, Qt3Support, q3toolbar.h)
    1202 QT_CLASS_LIB(Q3VBox, Qt3Support, q3vbox.h)
    1203 QT_CLASS_LIB(Q3VGroupBox, Qt3Support, q3vgroupbox.h)
    1204 QT_CLASS_LIB(Q3WhatsThis, Qt3Support, q3whatsthis.h)
    1205 QT_CLASS_LIB(Q3WidgetStack, Qt3Support, q3widgetstack.h)
     1227QT_CLASS_LIB(Q3FileIconProvider, Qt3Support, q3filedialog.h)
     1228QT_CLASS_LIB(Q3FilePreview, Qt3Support, q3filedialog.h)
     1229QT_CLASS_LIB(Q3FileDialog, Qt3Support, q3filedialog.h)
     1230QT_CLASS_LIB(Q3ProgressDialog, Qt3Support, q3progressdialog.h)
     1231QT_CLASS_LIB(Q3TabDialog, Qt3Support, q3tabdialog.h)
     1232QT_CLASS_LIB(Q3Wizard, Qt3Support, q3wizard.h)
    12061233QT_CLASS_LIB(Q3DataBrowser, Qt3Support, q3databrowser.h)
    12071234QT_CLASS_LIB(Q3DataTable, Qt3Support, q3datatable.h)
    … …  
    12161243QT_CLASS_LIB(Q3SqlRecordInfo, Qt3Support, q3sqlrecordinfo.h)
    12171244QT_CLASS_LIB(Q3SqlSelectCursor, Qt3Support, q3sqlselectcursor.h)
    1218 QT_CLASS_LIB(Q3Dns, Qt3Support, q3dns.h)
    1219 QT_CLASS_LIB(Q3DnsSocket, Qt3Support, q3dns.h)
    1220 QT_CLASS_LIB(Q3Ftp, Qt3Support, q3ftp.h)
    1221 QT_CLASS_LIB(Q3HttpHeader, Qt3Support, q3http.h)
    1222 QT_CLASS_LIB(Q3HttpResponseHeader, Qt3Support, q3http.h)
    1223 QT_CLASS_LIB(Q3HttpRequestHeader, Qt3Support, q3http.h)
    1224 QT_CLASS_LIB(Q3Http, Qt3Support, q3http.h)
    1225 QT_CLASS_LIB(Q3LocalFs, Qt3Support, q3localfs.h)
    1226 QT_CLASS_LIB(Q3NetworkProtocolFactoryBase, Qt3Support, q3networkprotocol.h)
    1227 QT_CLASS_LIB(Q3NetworkProtocolFactory, Qt3Support, q3networkprotocol.h)
    1228 QT_CLASS_LIB(Q3NetworkProtocolDict, Qt3Support, q3networkprotocol.h)
    1229 QT_CLASS_LIB(Q3NetworkProtocol, Qt3Support, q3networkprotocol.h)
    1230 QT_CLASS_LIB(Q3NetworkOperation, Qt3Support, q3networkprotocol.h)
    1231 QT_CLASS_LIB(Q3ServerSocket, Qt3Support, q3serversocket.h)
    1232 QT_CLASS_LIB(Q3Socket, Qt3Support, q3socket.h)
    1233 QT_CLASS_LIB(Q3SocketDevice, Qt3Support, q3socketdevice.h)
    1234 QT_CLASS_LIB(Q3Url, Qt3Support, q3url.h)
    1235 QT_CLASS_LIB(Q3UrlOperator, Qt3Support, q3urloperator.h)
    1236 QT_CLASS_LIB(Q3MultiLineEdit, Qt3Support, q3multilineedit.h)
    1237 QT_CLASS_LIB(Q3SimpleRichText, Qt3Support, q3simplerichtext.h)
    1238 QT_CLASS_LIB(Q3StyleSheetItem, Qt3Support, q3stylesheet.h)
    1239 QT_CLASS_LIB(Q3StyleSheet, Qt3Support, q3stylesheet.h)
    1240 QT_CLASS_LIB(Q3SyntaxHighlighter, Qt3Support, q3syntaxhighlighter.h)
    1241 QT_CLASS_LIB(Q3TextBrowser, Qt3Support, q3textbrowser.h)
    1242 QT_CLASS_LIB(Q3TextEditOptimPrivate, Qt3Support, q3textedit.h)
    1243 QT_CLASS_LIB(Q3TextEdit, Qt3Support, q3textedit.h)
    1244 QT_CLASS_LIB(Q3TextStream, Qt3Support, q3textstream.h)
    1245 QT_CLASS_LIB(Q3TSFUNC, Qt3Support, q3textstream.h)
    1246 QT_CLASS_LIB(Q3TextView, Qt3Support, q3textview.h)
    1247 QT_CLASS_LIB(Q3FileIconProvider, Qt3Support, q3filedialog.h)
    1248 QT_CLASS_LIB(Q3FilePreview, Qt3Support, q3filedialog.h)
    1249 QT_CLASS_LIB(Q3FileDialog, Qt3Support, q3filedialog.h)
    1250 QT_CLASS_LIB(Q3ProgressDialog, Qt3Support, q3progressdialog.h)
    1251 QT_CLASS_LIB(Q3TabDialog, Qt3Support, q3tabdialog.h)
    1252 QT_CLASS_LIB(Q3Wizard, Qt3Support, q3wizard.h)
    12531245QT_CLASS_LIB(Q3Accel, Qt3Support, q3accel.h)
    12541246QT_CLASS_LIB(Q3BoxLayout, Qt3Support, q3boxlayout.h)
    … …  
    12661258QT_CLASS_LIB(Q3PolygonScanner, Qt3Support, q3polygonscanner.h)
    12671259QT_CLASS_LIB(Q3Process, Qt3Support, q3process.h)
     1260QT_CLASS_LIB(Q3CanvasItemList, Qt3Support, q3canvas.h)
     1261QT_CLASS_LIB(Q3CanvasItem, Qt3Support, q3canvas.h)
     1262QT_CLASS_LIB(Q3Canvas, Qt3Support, q3canvas.h)
     1263QT_CLASS_LIB(Q3CanvasView, Qt3Support, q3canvas.h)
     1264QT_CLASS_LIB(Q3CanvasPixmap, Qt3Support, q3canvas.h)
     1265QT_CLASS_LIB(Q3CanvasPixmapArray, Qt3Support, q3canvas.h)
     1266QT_CLASS_LIB(Q3CanvasSprite, Qt3Support, q3canvas.h)
     1267QT_CLASS_LIB(Q3CanvasPolygonalItem, Qt3Support, q3canvas.h)
     1268QT_CLASS_LIB(Q3CanvasRectangle, Qt3Support, q3canvas.h)
     1269QT_CLASS_LIB(Q3CanvasPolygon, Qt3Support, q3canvas.h)
     1270QT_CLASS_LIB(Q3CanvasSpline, Qt3Support, q3canvas.h)
     1271QT_CLASS_LIB(Q3CanvasLine, Qt3Support, q3canvas.h)
     1272QT_CLASS_LIB(Q3CanvasEllipse, Qt3Support, q3canvas.h)
     1273QT_CLASS_LIB(Q3CanvasText, Qt3Support, q3canvas.h)
     1274QT_CLASS_LIB(Q3MultiLineEdit, Qt3Support, q3multilineedit.h)
     1275QT_CLASS_LIB(Q3SimpleRichText, Qt3Support, q3simplerichtext.h)
     1276QT_CLASS_LIB(Q3StyleSheetItem, Qt3Support, q3stylesheet.h)
     1277QT_CLASS_LIB(Q3StyleSheet, Qt3Support, q3stylesheet.h)
     1278QT_CLASS_LIB(Q3SyntaxHighlighter, Qt3Support, q3syntaxhighlighter.h)
     1279QT_CLASS_LIB(Q3TextBrowser, Qt3Support, q3textbrowser.h)
     1280QT_CLASS_LIB(Q3TextEditOptimPrivate, Qt3Support, q3textedit.h)
     1281QT_CLASS_LIB(Q3TextEdit, Qt3Support, q3textedit.h)
     1282QT_CLASS_LIB(Q3TextStream, Qt3Support, q3textstream.h)
     1283QT_CLASS_LIB(Q3TSFUNC, Qt3Support, q3textstream.h)
     1284QT_CLASS_LIB(Q3TextView, Qt3Support, q3textview.h)
    12681285QT_CLASS_LIB(Q3AsciiCache, Qt3Support, q3asciicache.h)
    12691286QT_CLASS_LIB(Q3AsciiCacheIterator, Qt3Support, q3asciicache.h)
    … …  
    13401357QT_CLASS_LIB(Q3CheckTableItem, Qt3Support, q3table.h)
    13411358QT_CLASS_LIB(Q3Table, Qt3Support, q3table.h)
     1359QT_CLASS_LIB(Q3Action, Qt3Support, q3action.h)
     1360QT_CLASS_LIB(Q3ActionGroup, Qt3Support, q3action.h)
     1361QT_CLASS_LIB(Q3Button, Qt3Support, q3button.h)
     1362QT_CLASS_LIB(Q3ButtonGroup, Qt3Support, q3buttongroup.h)
     1363QT_CLASS_LIB(Q3VButtonGroup, Qt3Support, q3buttongroup.h)
     1364QT_CLASS_LIB(Q3HButtonGroup, Qt3Support, q3buttongroup.h)
     1365QT_CLASS_LIB(Q3ComboBox, Qt3Support, q3combobox.h)
     1366QT_CLASS_LIB(Q3DateTimeEditBase, Qt3Support, q3datetimeedit.h)
     1367QT_CLASS_LIB(Q3DateEdit, Qt3Support, q3datetimeedit.h)
     1368QT_CLASS_LIB(Q3TimeEdit, Qt3Support, q3datetimeedit.h)
     1369QT_CLASS_LIB(Q3DateTimeEdit, Qt3Support, q3datetimeedit.h)
     1370QT_CLASS_LIB(Q3DockAreaLayout, Qt3Support, q3dockarea.h)
     1371QT_CLASS_LIB(Q3DockArea, Qt3Support, q3dockarea.h)
     1372QT_CLASS_LIB(Q3DockWindow, Qt3Support, q3dockwindow.h)
     1373QT_CLASS_LIB(Q3Frame, Qt3Support, q3frame.h)
     1374QT_CLASS_LIB(Q3Grid, Qt3Support, q3grid.h)
     1375QT_CLASS_LIB(Q3GridView, Qt3Support, q3gridview.h)
     1376QT_CLASS_LIB(Q3GroupBox, Qt3Support, q3groupbox.h)
     1377QT_CLASS_LIB(Q3HBox, Qt3Support, q3hbox.h)
     1378QT_CLASS_LIB(Q3Header, Qt3Support, q3header.h)
     1379QT_CLASS_LIB(Q3HGroupBox, Qt3Support, q3hgroupbox.h)
     1380QT_CLASS_LIB(Q3MainWindow, Qt3Support, q3mainwindow.h)
     1381QT_CLASS_LIB(Q3PopupMenu, Qt3Support, q3popupmenu.h)
     1382QT_CLASS_LIB(Q3ProgressBar, Qt3Support, q3progressbar.h)
     1383QT_CLASS_LIB(Q3RangeControl, Qt3Support, q3rangecontrol.h)
     1384QT_CLASS_LIB(Q3SpinWidget, Qt3Support, q3rangecontrol.h)
     1385QT_CLASS_LIB(Q3ScrollView, Qt3Support, q3scrollview.h)
     1386QT_CLASS_LIB(Q3ToolBar, Qt3Support, q3toolbar.h)
     1387QT_CLASS_LIB(Q3VBox, Qt3Support, q3vbox.h)
     1388QT_CLASS_LIB(Q3VGroupBox, Qt3Support, q3vgroupbox.h)
     1389QT_CLASS_LIB(Q3WhatsThis, Qt3Support, q3whatsthis.h)
     1390QT_CLASS_LIB(Q3WidgetStack, Qt3Support, q3widgetstack.h)
     1391QT_CLASS_LIB(Q3Dns, Qt3Support, q3dns.h)
     1392QT_CLASS_LIB(Q3DnsSocket, Qt3Support, q3dns.h)
     1393QT_CLASS_LIB(Q3Ftp, Qt3Support, q3ftp.h)
     1394QT_CLASS_LIB(Q3HttpHeader, Qt3Support, q3http.h)
     1395QT_CLASS_LIB(Q3HttpResponseHeader, Qt3Support, q3http.h)
     1396QT_CLASS_LIB(Q3HttpRequestHeader, Qt3Support, q3http.h)
     1397QT_CLASS_LIB(Q3Http, Qt3Support, q3http.h)
     1398QT_CLASS_LIB(Q3LocalFs, Qt3Support, q3localfs.h)
     1399QT_CLASS_LIB(Q3NetworkProtocolFactoryBase, Qt3Support, q3networkprotocol.h)
     1400QT_CLASS_LIB(Q3NetworkProtocolFactory, Qt3Support, q3networkprotocol.h)
     1401QT_CLASS_LIB(Q3NetworkProtocolDict, Qt3Support, q3networkprotocol.h)
     1402QT_CLASS_LIB(Q3NetworkProtocol, Qt3Support, q3networkprotocol.h)
     1403QT_CLASS_LIB(Q3NetworkOperation, Qt3Support, q3networkprotocol.h)
     1404QT_CLASS_LIB(Q3ServerSocket, Qt3Support, q3serversocket.h)
     1405QT_CLASS_LIB(Q3Socket, Qt3Support, q3socket.h)
     1406QT_CLASS_LIB(Q3SocketDevice, Qt3Support, q3socketdevice.h)
     1407QT_CLASS_LIB(Q3Url, Qt3Support, q3url.h)
     1408QT_CLASS_LIB(Q3UrlOperator, Qt3Support, q3urloperator.h)
    13421409QT_CLASS_LIB(Q3PaintDeviceMetrics, Qt3Support, q3paintdevicemetrics.h)
    13431410QT_CLASS_LIB(Q3Painter, Qt3Support, q3painter.h)
    13441411QT_CLASS_LIB(Q3Picture, Qt3Support, q3picture.h)
    13451412QT_CLASS_LIB(Q3PointArray, Qt3Support, q3pointarray.h)
    1346 QT_CLASS_LIB(Q3CanvasItemList, Qt3Support, q3canvas.h)
    1347 QT_CLASS_LIB(Q3CanvasItem, Qt3Support, q3canvas.h)
    1348 QT_CLASS_LIB(Q3Canvas, Qt3Support, q3canvas.h)
    1349 QT_CLASS_LIB(Q3CanvasView, Qt3Support, q3canvas.h)
    1350 QT_CLASS_LIB(Q3CanvasPixmap, Qt3Support, q3canvas.h)
    1351 QT_CLASS_LIB(Q3CanvasPixmapArray, Qt3Support, q3canvas.h)
    1352 QT_CLASS_LIB(Q3CanvasSprite, Qt3Support, q3canvas.h)
    1353 QT_CLASS_LIB(Q3CanvasPolygonalItem, Qt3Support, q3canvas.h)
    1354 QT_CLASS_LIB(Q3CanvasRectangle, Qt3Support, q3canvas.h)
    1355 QT_CLASS_LIB(Q3CanvasPolygon, Qt3Support, q3canvas.h)
    1356 QT_CLASS_LIB(Q3CanvasSpline, Qt3Support, q3canvas.h)
    1357 QT_CLASS_LIB(Q3CanvasLine, Qt3Support, q3canvas.h)
    1358 QT_CLASS_LIB(Q3CanvasEllipse, Qt3Support, q3canvas.h)
    1359 QT_CLASS_LIB(Q3CanvasText, Qt3Support, q3canvas.h)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/converter.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    519519        Option opt;
    520520        opt.extractImages = m_extractImages;
     521        opt.limitXPM_LineLength = (m_options & LimitXPM_LineLength) ? 1 : 0;
    521522        opt.qrcOutputFile = m_qrcOutputFile;
    522523        CPP::ExtractImages(opt).acceptUI(ui);

  • trunk/src/tools/uic3/deps.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/domtool.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/domtool.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/embed.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/form.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    257257    d.option().copyrightHeader = false;
    258258    d.option().extractImages = m_extractImages;
     259    d.option().limitXPM_LineLength = (m_options & LimitXPM_LineLength) ? 1 : 0;
    259260    d.option().qrcOutputFile = m_qrcOutputFile;
    260261    d.option().implicitIncludes = (m_options & ImplicitIncludes) ? 1 : 0;

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

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    150150            } else if (opt == "layout-names") {
    151151                readerOptions |= Ui3Reader::PreserveLayoutNames;
     152            } else if (opt == "limit-xpm-linelength") {
     153                readerOptions |= Ui3Reader::LimitXPM_LineLength;
    152154            } else if (opt == "nounload") {
    153155                // skip
    … …  
    252254                 "\t-o file            Write output to file rather than stdout\n"
    253255                 "\t-extract qrcFile   Create resource file and extract embedded images into \"image\" dir\n"
     256                 "\t-limit-xpm-linelength Limit the line length of XPM files for -extract.\n"
    254257                 "\t-pch file          Add #include \"file\" as the first statement in implementation\n"
    255258                 "\t-nofwd             Omit forward declarations of custom classes\n"

  • trunk/src/tools/uic3/object.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/parser.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/parser.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/qt3to4.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/qt3to4.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/subclassing.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/ui3reader.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/ui3reader.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    6969{
    7070public:
    71     enum Options { CustomWidgetForwardDeclarations = 0x1, ImplicitIncludes = 0x2, PreserveLayoutNames = 0x4 };
     71    enum Options { CustomWidgetForwardDeclarations = 0x1, ImplicitIncludes = 0x2,
     72                   PreserveLayoutNames = 0x4, LimitXPM_LineLength = 0x8 };
    7273
    7374    explicit Ui3Reader(QTextStream &stream, unsigned options);

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/widgetinfo.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/src/tools/uic3/widgetinfo.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
Note: See TracChangeset for help on using the changeset viewer.