Changeset 863 for branches/vendor


Ignore:
Timestamp:
May 16, 2011, 3:45:04 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

vendor: Imported qt-everywhere-opensource-src-4.7.3 from Nokia (excluding doc/html and doc/qch dirs generated from doc/src, and imports and templates dirs which are emtpy).

Location:
branches/vendor/nokia/qt/current
Files:
1 added
1 deleted
44 edited

Legend:

Unmodified
Added
Removed

  • branches/vendor/nokia/qt/current/.tag

    r844 r863  
    1 Source revision: 0828c69ad805406568f6eef2bffbbd54b04dea41
    2 Mkdist revision: 74a394eb70d29b9f9db6d12c1000c80e2f3db530
     1Source revision:
     2Mkdist revision:
    33

  • branches/vendor/nokia/qt/current/INSTALL

    r844 r863  
    1         INSTALLING Qt Source Package Version 4.7.2.
     1        INSTALLING Qt Source Package Version 4.7..
    22
    33For full installation instructions for each supported platform, please

  • branches/vendor/nokia/qt/current/README

    r844 r863  
    1 This is Qt version 4.7.2.
     1This is Qt version 4.7..
    22
    33Qt is a comprehensive cross-platform C++ application framework. Qt 4

  • branches/vendor/nokia/qt/current/doc/src/deployment/deployment.qdoc

    r844 r863  
    902902
    903903    "C:/customPath/plugins "
    904     "C:/Qt/4.7.2/plugins"
     904    "C:/Qt/4.7./plugins"
    905905    "E:/myApplication/directory/"
    906906

  • branches/vendor/nokia/qt/current/doc/src/getting-started/installation.qdoc

    r844 r863  
    5959\section1 Step 2: Unpacking the Archive
    6060    Unpack the archive if you have not done so already. For example,
    61     if you have the \c{qt-everywhere-opensource-src-4.7.2.tar.gz}
     61    if you have the \c{qt-everywhere-opensource-src-4.7..tar.gz}
    6262    package, type the following commands at a command line prompt:
    6363
    6464\snippet doc/src/snippets/code/doc_src_installation.qdoc 0
    6565
    66     This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.2}
     66    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.}
    6767    containing the files from the archive. We only support the GNU version of
    6868    the tar archiving utility. Note that on some systems it is called gtar.
    … …  
    7474
    7575    By default, Qt is configured for installation in the
    76     \c{/usr/local/Trolltech/Qt-4.7.2} directory, but this can be
     76    \c{/usr/local/Trolltech/Qt-4.7.} directory, but this can be
    7777    changed by using the \c{-prefix} option.
    7878
    … …  
    124124    For compilers that do not support rpath you must also extended the
    125125    \c LD_LIBRARY_PATH environment variable to include
    126     \c{/usr/local/Trolltech/Qt-4.7.2/lib}. On Linux with GCC this step
     126    \c{/usr/local/Trolltech/Qt-4.7./lib}. On Linux with GCC this step
    127127    is not needed.
    128128
    … …  
    185185
    186186    Uncompress the files into the directory you want Qt installed;
    187     e.g. \c{C:\Qt\4.7.2}.
     187    e.g. \c{C:\Qt\4.7.}.
    188188
    189189    \note The install path must not contain any spaces or Windows specific
    … …  
    197197\snippet doc/src/snippets/code/doc_src_installation.qdoc 7
    198198
    199     This is done by adding \c{c:\Qt\4.7.2\bin} to the \c PATH variable.
     199    This is done by adding \c{c:\Qt\4.7.\bin} to the \c PATH variable.
    200200
    201201    For newer versions of Windows, \c PATH can be extended through
    … …  
    297297
    298298    Unpack the archive if you have not done so already. For example,
    299     if you have the \c{qt-everywhere-opensource-src-4.7.2.tar.gz}
     299    if you have the \c{qt-everywhere-opensource-src-4.7..tar.gz}
    300300    package, type the following commands at a command line prompt:
    301301
    302302\snippet doc/src/snippets/code/doc_src_installation.qdoc 11
    303303
    304     This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.2}
     304    This creates the directory \c{/tmp/qt-everywhere-opensource-src-4.7.}
    305305    containing the files from the archive.
    306306
    … …  
    311311
    312312    By default, Qt is configured for installation in the
    313     \c{/usr/local/Trolltech/Qt-4.7.2} directory, but this can be
     313    \c{/usr/local/Trolltech/Qt-4.7.} directory, but this can be
    314314    changed by using the \c{-prefix} option.
    315315
    … …  
    405405\section1 Step 1: Install the License File (commercial editions only)
    406406    Uncompress the files into the directory you want to install Qt into;
    407     e.g., \c{C:\Qt\4.7.2}.
     407    e.g., \c{C:\Qt\4.7.}.
    408408
    409409    \note The install path must not contain any spaces.
    … …  
    415415
    416416\snippet doc/src/snippets/code/doc_src_installation.qdoc 18
    417     This is done by adding \c{c:\Qt\4.7.2\bin} to the \c PATH variable.
     417    This is done by adding \c{c:\Qt\4.7.\bin} to the \c PATH variable.
    418418
    419419    For newer versions of Windows, \c PATH can be extended through
    … …  
    506506\section1 Step 1: Install Qt
    507507
    508         Run \c{qt-symbian-opensource-4.7.2.exe} and follow the instructions.
     508        Run \c{qt-symbian-opensource-4.7..exe} and follow the instructions.
    509509
    510510        \note Qt must be installed on the same drive as the Symbian SDK you are
    … …  
    586586
    587587    Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source
    588     package into the directory you want Qt installed, e.g. \c{C:\Qt\4.7.2}.
     588    package into the directory you want Qt installed, e.g. \c{C:\Qt\4.7.}.
    589589
    590590    \note Qt must be installed on the same drive as the Symbian SDK you are
    … …  
    598598\snippet doc/src/snippets/code/doc_src_installation.qdoc 18
    599599
    600     This is done by adding \c{c:\Qt\4.7.2\bin} to the \c PATH variable.
     600    This is done by adding \c{c:\Qt\4.7.\bin} to the \c PATH variable.
    601601
    602602    On Windows the\c PATH can be extended by navigating to
    … …  
    711711
    712712Uncompress the \l{http://qt.nokia.com/downloads}{downloaded} source package into the
    713 directory you want Qt installed, e.g. \c{/home/user/qt/4.7.2}.
     713directory you want Qt installed, e.g. \c{/home/user/qt/4.7.}.
    714714
    715715

  • branches/vendor/nokia/qt/current/doc/src/platforms/emb-install.qdoc

    r844 r863  
    7676
    7777    Note that by default, \l{Qt for Embedded Linux} is configured for
    78     installation in the \c{/usr/local/Trolltech/QtEmbedded-4.7.2}
     78    installation in the \c{/usr/local/Trolltech/QtEmbedded-4.7.}
    7979    directory, but this can be changed by using the \c{-prefix}
    8080    option. Alternatively, the \c{-prefix-install} option can be used
    … …  
    136136    For compilers that do not support \c rpath you must also extend
    137137    the \c LD_LIBRARY_PATH environment variable to include
    138     \c /usr/local/Trolltech/QtEmbedded-4.7.2/lib. Note that on Linux
     138    \c /usr/local/Trolltech/QtEmbedded-4.7./lib. Note that on Linux
    139139    with GCC, this step is not needed.
    140140

  • branches/vendor/nokia/qt/current/doc/src/platforms/platform-notes.qdoc

    r844 r863  
    390390    \section1 Windows Vista
    391391
    392     At the time Qt 4.7.2 was released, there were no known Vista-specific issues.
     392    At the time Qt 4.7. was released, there were no known Vista-specific issues.
    393393
    394394    \target Windows NT

  • branches/vendor/nokia/qt/current/doc/src/platforms/wince-customization.qdoc

    r844 r863  
    200200    \o The shadow build directory must be on the same level as the Qt source
    201201        package.\br
    202     If the Qt package is in \c{C:\Qt\4.7.2} the shadow build directory
     202    If the Qt package is in \c{C:\Qt\4.7.} the shadow build directory
    203203    could be \c{C:\Qt\shadowbuild}. A shadow build from a directory like
    204204    \c{C:\shadowbuild} will not compile.
    … …  
    211211    \endlist
    212212
    213     So lets assume you have installed Qt in \c{C:\Qt\4.7.2} and you want
     213    So lets assume you have installed Qt in \c{C:\Qt\4.7.} and you want
    214214    to create a shadow build in \c{C:\Qt\mobile5-shadow}:
    215215

  • branches/vendor/nokia/qt/current/doc/src/qt4-intro.qdoc

    r844 r863  
    624624    included in the \c changes-4.6.0 file
    625625    \l{http://qt.nokia.com/developer/changes/changes-4.6.0}{available
    626     online}. A \l{Known Issues in 4.7.2}{list of known issues}
     626    online}. A \l{Known Issues in 4.7.}{list of known issues}
    627627    for this release is also available.
    628628
    629629    Changes between this release and the previous release are provided
    630     in the \c{changes-4.7.2} file (also
    631     \l{http://qt.nokia.com/developer/changes/changes-4.7.2}{available online}).
     630    in the \c{changes-4.7.} file (also
     631    \l{http://qt.nokia.com/developer/changes/changes-4.7.}{available online}).
    632632\endomit
    633633
    … …  
    834834    in the \c changes-4.5.0 file
    835835    \l{http://qt.nokia.com/developer/changes/changes-4.5.0}{available online}.
    836     A \l{Known Issues in 4.7.2}{list of known issues} for this release is also
     836    A \l{Known Issues in 4.7.}{list of known issues} for this release is also
    837837    available.
    838838
    839839    Changes between this release and the previous release are provided
    840     in the \c{changes-4.7.2} file (also
    841     \l{http://qt.nokia.com/developer/changes/changes-4.7.2}{available online}).
     840    in the \c{changes-4.7.} file (also
     841    \l{http://qt.nokia.com/developer/changes/changes-4.7.}{available online}).
    842842
    843843    A list of other Qt 4 features can be found on the

  • branches/vendor/nokia/qt/current/doc/src/snippets/code/doc_src_emb-install.qdoc

    r844 r863  
    4141//! [0]
    4242cd <anywhere>
    43 gunzip qt-everywhere-opensource-src-4.7.2.tar.gz
    44 tar xf qt-everywhere-opensource-src-4.7.2.tar
     43gunzip qt-everywhere-opensource-src-4.7..tar.gz
     44tar xf qt-everywhere-opensource-src-4.7..tar
    4545//! [0]
    4646
    4747
    4848//! [1]
    49 ~/qt-everywhere-opensource-src-4.7.2
     49~/qt-everywhere-opensource-src-4.7.
    5050//! [1]
    5151
    … …  
    5656
    5757//! [2]
    58 cd  ~/qt-everywhere-opensource-src-4.7.2
     58cd  ~/qt-everywhere-opensource-src-4.7.
    5959./configure -embedded [architecture]
    6060//! [2]
    … …  
    7272
    7373//! [5]
    74 PATH=/usr/local/Trolltech/QtEmbedded-4.7.2/bin:$PATH
     74PATH=/usr/local/Trolltech/QtEmbedded-4.7./bin:$PATH
    7575export PATH
    7676//! [5]
    … …  
    7878
    7979//! [6]
    80 setenv PATH /usr/local/Trolltech/QtEmbedded-4.7.2/bin:$PATH
     80setenv PATH /usr/local/Trolltech/QtEmbedded-4.7./bin:$PATH
    8181//! [6]

  • branches/vendor/nokia/qt/current/doc/src/snippets/code/doc_src_installation.qdoc

    r844 r863  
    4141//! [0]
    4242cd /tmp
    43 gunzip qt-everywhere-opensource-src-4.7.2.tar.gz        # uncompress the archive
    44 tar xvf qt-everywhere-opensource-src-4.7.2.tar          # unpack it
     43gunzip qt-everywhere-opensource-src-4.7..tar.gz        # uncompress the archive
     44tar xvf qt-everywhere-opensource-src-4.7..tar          # unpack it
    4545//! [0]
    4646
    4747
    4848//! [1]
    49 cd /tmp/qt-everywhere-opensource-src-4.7.2
     49cd /tmp/qt-everywhere-opensource-src-4.7.
    5050./configure
    5151//! [1]
    … …  
    6868
    6969//! [5]
    70 PATH=/usr/local/Trolltech/Qt-4.7.2/bin:$PATH
     70PATH=/usr/local/Trolltech/Qt-4.7./bin:$PATH
    7171export PATH
    7272//! [5]
    … …  
    7474
    7575//! [6]
    76 setenv PATH /usr/local/Trolltech/Qt-4.7.2/bin:$PATH
     76setenv PATH /usr/local/Trolltech/Qt-4.7./bin:$PATH
    7777//! [6]
    7878
    … …  
    8585//! [8]
    8686C:
    87 cd /D C:\Qt\4.7.2
     87cd /D C:\Qt\4.7.
    8888configure
    8989//! [8]
    … …  
    102102//! [11]
    103103cd /tmp
    104 gunzip qt-everywhere-opensource-src-4.7.2.tar.gz        # uncompress the archive
    105 tar xvf qt-everywhere-opensource-src-4.7.2.tar          # unpack it
     104gunzip qt-everywhere-opensource-src-4.7..tar.gz        # uncompress the archive
     105tar xvf qt-everywhere-opensource-src-4.7..tar          # unpack it
    106106//! [11]
    107107
    108108
    109109//! [12]
    110 cd /tmp/qt-everywhere-opensource-src-4.7.2
     110cd /tmp/qt-everywhere-opensource-src-4.7.
    111111./configure
    112112//! [12]
    … …  
    129129
    130130//! [16]
    131 PATH=/usr/local/Trolltech/Qt-4.7.2/bin:$PATH
     131PATH=/usr/local/Trolltech/Qt-4.7./bin:$PATH
    132132export PATH
    133133//! [16]
    … …  
    135135
    136136//! [17]
    137 setenv PATH /usr/local/Trolltech/Qt-4.7.2/bin:$PATH
     137setenv PATH /usr/local/Trolltech/Qt-4.7./bin:$PATH
    138138//! [17]
    139139
    … …  
    146146//! [19]
    147147C:
    148 cd \Qt\4.7.2
     148cd \Qt\4.7.
    149149configure -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
    150150//! [19]
    … …  
    169169
    170170//! [23]
    171 cd \Qt\4.7.2
     171cd \Qt\4.7.
    172172configure -platform win32-g++ -xplatform symbian-abld
    173173//! [23]
    … …  
    208208
    209209//! [31]
    210 cd \Qt\4.7.2
     210cd \Qt\4.7.
    211211configure -platform win32-g++ -xplatform symbian-sbsv2
    212212//! [31]
    … …  
    245245
    246246//! [37]
    247 PATH=/home/user/qt/4.7.2/bin:$EPOCROOT/epoc32/tools:$PATH
     247PATH=/home/user/qt/4.7./bin:$EPOCROOT/epoc32/tools:$PATH
    248248export PATH
    249249//! [37]
    250250
    251251//! [38]
    252 cd /home/user/qt/4.7.2
     252cd /home/user/qt/4.7.
    253253./configure -platform linux-g++ -xplatform symbian/linux-armcc
    254254//! [38]
    255255
    256256//! [39]
    257 cd /home/user/qt/4.7.2
     257cd /home/user/qt/4.7.
    258258./configure -platform linux-g++ -xplatform symbian/linux-gcce -no-webkit
    259259//! [39]

  • branches/vendor/nokia/qt/current/doc/src/snippets/code/doc_src_qtestlib.qdoc

    r844 r863  
    110110//! [10]
    111111********* Start testing of TestQString *********
    112 Config: Using QTest library 4.7.2, Qt 4.7.2
     112Config: Using QTest library 4.7.
    113113PASS   : TestQString::initTestCase()
    114114PASS   : TestQString::toUpper()

  • branches/vendor/nokia/qt/current/doc/src/snippets/code/doc_src_wince-customization.qdoc

    r844 r863  
    6262//! [4]
    6363cd c:\Qt\mobile5-shadow
    64 C:\Qt\4.7.2\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
     64C:\Qt\4.7.\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
    6565//! [4]
    6666

  • branches/vendor/nokia/qt/current/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri

    r844 r863  
    1 QT_WEBKIT_VERSION = 4.7.2
     1QT_WEBKIT_VERSION = 4.7.
    22QT_WEBKIT_MAJOR_VERSION = 4
    33QT_WEBKIT_MINOR_VERSION = 7
    4 QT_WEBKIT_PATCH_VERSION = 2
     4QT_WEBKIT_PATCH_VERSION =
    55QT_CONFIG += webkit

  • branches/vendor/nokia/qt/current/src/corelib/global/qglobal.h

    r844 r863  
    4545#include <stddef.h>
    4646
    47 #define QT_VERSION_STR "4.7.2"
     47#define QT_VERSION_STR "4.7."
    4848/*
    4949   QT_VERSION is (major << 16) + (minor << 8) + patch.
    5050*/
    51 #define QT_VERSION 0x040702
     51#define QT_VERSION 0x04070
    5252/*
    5353   can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
    … …  
    5555#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
    5656
    57 #define QT_PACKAGEDATE_STR "2011-02-22"
    58 
    59 #define QT_PACKAGE_TAG "0828c69ad805406568f6eef2bffbbd54b04dea41"
     57#define QT_PACKAGEDATE_STR "2011-0"
     58
     59#define QT_PACKAGE_TAG ""
    6060
    6161#if !defined(QT_BUILD_MOC)

  • branches/vendor/nokia/qt/current/src/declarative/debugger/qdeclarativedebugservice_p.h

    r844 r863  
    5454
    5555class QDeclarativeDebugServicePrivate;
    56 class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugService : public QObject
     56class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
    5757{
    5858    Q_OBJECT

  • branches/vendor/nokia/qt/current/src/gui/image/qpixmap_s60.cpp

    r844 r863  
    600600}
    601601
     602
     603
     604
    602605int QS60PixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
    603606{
    … …  
    610613    case QPaintDevice::PdmHeight:
    611614        return cfbsBitmap->SizeInPixels().iHeight;
    612     case QPaintDevice::PdmWidthMM: {
    613         TInt twips = cfbsBitmap->SizeInTwips().iWidth;
    614         return (int)(twips * (25.4/KTwipsPerInch));
    615     }
    616     case QPaintDevice::PdmHeightMM: {
    617         TInt twips = cfbsBitmap->SizeInTwips().iHeight;
    618         return (int)(twips * (25.4/KTwipsPerInch));
    619     }
     615    case QPaintDevice::PdmWidthMM:
     616        return qRound(cfbsBitmap->SizeInPixels().iWidth * 25.4 / qt_defaultDpiX());
     617    case QPaintDevice::PdmHeightMM:
     618        return qRound(cfbsBitmap->SizeInPixels().iHeight * 25.4 / qt_defaultDpiY());
    620619    case QPaintDevice::PdmNumColors:
    621620        return TDisplayModeUtils::NumDisplayModeColors(cfbsBitmap->DisplayMode());
    622621    case QPaintDevice::PdmDpiX:
    623     case QPaintDevice::PdmPhysicalDpiX: {
    624         TReal inches = cfbsBitmap->SizeInTwips().iWidth / (TReal)KTwipsPerInch;
    625         TInt pixels = cfbsBitmap->SizeInPixels().iWidth;
    626         return pixels / inches;
    627     }
     622    case QPaintDevice::PdmPhysicalDpiX:
     623        return qt_defaultDpiX();
    628624    case QPaintDevice::PdmDpiY:
    629     case QPaintDevice::PdmPhysicalDpiY: {
    630         TReal inches = cfbsBitmap->SizeInTwips().iHeight / (TReal)KTwipsPerInch;
    631         TInt pixels = cfbsBitmap->SizeInPixels().iHeight;
    632         return pixels / inches;
    633     }
     625    case QPaintDevice::PdmPhysicalDpiY:
     626        return qt_defaultDpiY();
    634627    case QPaintDevice::PdmDepth:
    635628        return TDisplayModeUtils::NumDisplayModeBitsPerPixel(cfbsBitmap->DisplayMode());

  • branches/vendor/nokia/qt/current/src/gui/kernel/qapplication_s60.cpp

    r844 r863  
    12441244        qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle());
    12451245#ifdef Q_WS_S60
    1246         // If widget is fullscreen/minimized, hide status pane and button container otherwise show them.
    1247         QWidget *const window = qwidget->window();
    1248         if (!window->parentWidget()) { // Only top level native windows have control over cba/status pane
    1249             const bool decorationsVisible = !(window->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized));
    1250             const bool statusPaneVisibility = decorationsVisible;
    1251             const bool isFullscreen = window->windowState() & Qt::WindowFullScreen;
    1252             const bool cbaVisibilityHint = window->windowFlags() & Qt::WindowSoftkeysVisibleHint;
    1253             const bool buttonGroupVisibility = (decorationsVisible || (isFullscreen && cbaVisibilityHint));
    1254             S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
     1246        if (qwidget->isWindow()) {
     1247            QWidget *const window = qwidget->window();
     1248            QWidget *parentWindow = window->parentWidget();
     1249            if (parentWindow) {
     1250                while (parentWindow->parentWidget())
     1251                    parentWindow = parentWindow->parentWidget();
     1252            } else {
     1253                parentWindow = window;
     1254            }
     1255
     1256            const bool parentDecorationsVisible = !(parentWindow->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized));
     1257            const bool parentIsFullscreen = parentWindow->windowState() & Qt::WindowFullScreen;
     1258            const bool parentCbaVisibilityHint = parentWindow->windowFlags() & Qt::WindowSoftkeysVisibleHint;
     1259            bool buttonGroupVisibility = (parentDecorationsVisible || (parentIsFullscreen && parentCbaVisibilityHint));
     1260
     1261            // For non-toplevel normal and maximized windows, show cba if window has softkey
     1262            // actions even if topmost parent is not showing cba. Do the same for fullscreen
     1263            // windows that request it.
     1264            if (!buttonGroupVisibility
     1265                && window->parentWidget()
     1266                && !(window->windowState() & Qt::WindowMinimized)
     1267                && ((window->windowFlags() & Qt::WindowSoftkeysVisibleHint) || !(window->windowState() & Qt::WindowFullScreen))) {
     1268                for (int i = 0; i < window->actions().size(); ++i) {
     1269                    if (window->actions().at(i)->softKeyRole() != QAction::NoSoftKey) {
     1270                        buttonGroupVisibility = true;
     1271                        break;
     1272                    }
     1273                }
     1274            }
     1275            S60->setStatusPaneAndButtonGroupVisibility(parentDecorationsVisible, buttonGroupVisibility);
    12551276        }
    12561277#endif

  • branches/vendor/nokia/qt/current/src/gui/kernel/qwidget_s60.cpp

    r844 r863  
    11851185
    11861186#ifdef Q_WS_S60
    1187         bool decorationsVisible(false);
    1188         if (!parentWidget()) { // Only top level native windows have control over cba/status pane
    1189             // Hide window decoration when switching to fullscreen / minimized otherwise show decoration.
    1190             // The window decoration visibility has to be changed before doing actual window state
    1191             // change since in that order the availableGeometry will return directly the right size and
    1192             // we will avoid unnecessary redraws
    1193             decorationsVisible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized));
    1194             const bool statusPaneVisibility = decorationsVisible;
    1195             const bool buttonGroupVisibility = (decorationsVisible || (isFullscreen && cbaRequested));
    1196             S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
    1197         }
     1187        // Hide window decoration when switching to fullscreen / minimized otherwise show decoration.
     1188        // The window decoration visibility has to be changed before doing actual window state
     1189        // change since in that order the availableGeometry will return directly the right size and
     1190        // we will avoid unnecessary redraws
     1191        Qt::WindowStates comparisonState = newstate;
     1192        QWidget *parentWindow = parentWidget();
     1193        if (parentWindow) {
     1194            while (parentWindow->parentWidget())
     1195                parentWindow = parentWindow->parentWidget();
     1196            comparisonState = parentWindow->windowState();
     1197        } else {
     1198            parentWindow = this;
     1199        }
     1200
     1201        const bool decorationsVisible = !(comparisonState & (Qt::WindowFullScreen | Qt::WindowMinimized));
     1202        const bool parentIsFullscreen = comparisonState & Qt::WindowFullScreen;
     1203        const bool parentCbaVisibilityHint = parentWindow->windowFlags() & Qt::WindowSoftkeysVisibleHint;
     1204        bool buttonGroupVisibility = (decorationsVisible || (parentIsFullscreen && parentCbaVisibilityHint));
     1205
     1206        // For non-toplevel normal and maximized windows, show cba if window has softkey
     1207        // actions even if topmost parent is not showing cba. Do the same for fullscreen
     1208        // windows that request it.
     1209        if (!buttonGroupVisibility
     1210            && parentWidget()
     1211            && !(newstate & Qt::WindowMinimized)
     1212            && ((windowFlags() & Qt::WindowSoftkeysVisibleHint) || !(newstate & Qt::WindowFullScreen))) {
     1213            for (int i = 0; i < actions().size(); ++i) {
     1214                if (actions().at(i)->softKeyRole() != QAction::NoSoftKey) {
     1215                    buttonGroupVisibility = true;
     1216                    break;
     1217                }
     1218            }
     1219        }
     1220        S60->setStatusPaneAndButtonGroupVisibility(decorationsVisible, buttonGroupVisibility);
     1221
    11981222#endif // Q_WS_S60
    11991223

  • branches/vendor/nokia/qt/current/src/gui/styles/qs60style.cpp

    r844 r863  
    26442644            //native items have small empty areas at the beginning and end of menu item
    26452645            sz.setWidth(sz.width() + 2 * pixelMetric(PM_MenuHMargin) + 2 * QS60StylePrivate::pixelMetric(PM_FrameCornerWidth));
    2646             if (QS60StylePrivate::isTouchSupported())
     2646            if (QS60StylePrivate::isTouchSupported())
    26472647                //Make itemview easier to use in touch devices
     2648
    26482649                //QCommonStyle does not adjust height with horizontal margin, it only adjusts width
    2649                 sz.setHeight(sz.height() + 2 * pixelMetric(PM_FocusFrameVMargin) - 8); //QCommonstyle adds 8 to height that this style handles through PM values
     2650                if (ct == CT_MenuItem)
     2651                    sz.setHeight(sz.height() - 8); //QCommonstyle adds 8 to height that this style handles through PM values
     2652            }
    26502653            break;
    26512654#ifndef QT_NO_COMBOBOX

  • branches/vendor/nokia/qt/current/src/network/bearer/qnetworksession.h

    r844 r863  
    142142#ifndef QT_MOBILITY_BEARER
    143143QT_END_NAMESPACE
     144
     145
    144146#else
    145147QTM_END_NAMESPACE
    146148#endif
    147 
    148 Q_DECLARE_METATYPE(QNetworkSession::State)
    149 Q_DECLARE_METATYPE(QNetworkSession::SessionError)
    150149
    151150QT_END_HEADER

  • branches/vendor/nokia/qt/current/src/network/ssl/qsslcertificate.cpp

    r844 r863  
    220220    false.
    221221
    222     Note: Currently, this function only checks that the current
     222    Note: Currently, this function checks that the current
    223223    data-time is within the date-time range during which the
    224     certificate is considered valid. No other checks are
    225     currently performed.
     224    certificate is considered valide
     225    c.
    226226
    227227    \sa isNull()
    … …  
    230230{
    231231    const QDateTime currentTime = QDateTime::currentDateTime();
    232     return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
     232    return currentTime >= d->notValidBefore &&
     233            currentTime <= d->notValidAfter &&
     234            ! QSslCertificatePrivate::isBlacklisted(*this);
    233235}
    234236
    … …  
    799801}
    800802
     803
     804
     805
     806
     807
     808
     809
     810
     811
     812
     813
     814
     815
     816
     817
     818
     819
     820
     821
     822
     823
     824
     825
     826
    801827#ifndef QT_NO_DEBUG_STREAM
    802828QDebug operator<<(QDebug debug, const QSslCertificate &certificate)

  • branches/vendor/nokia/qt/current/src/network/ssl/qsslcertificate_p.h

    r844 r863  
    9797    static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
    9898    static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
     99
    99100
    100101    friend class QSslSocketBackendPrivate;

  • branches/vendor/nokia/qt/current/src/network/ssl/qsslsocket_openssl.cpp

    r844 r863  
    11841184    configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
    11851185    q_X509_free(x509);
     1186
     1187
     1188
     1189
     1190
     1191
     1192
    11861193
    11871194    // Start translating errors.

  • branches/vendor/nokia/qt/current/src/openvg/qpaintengine_vg.cpp

    r844 r863  
    23342334{
    23352335#if defined(QVG_SCISSOR_CLIP)
     2336
    23362337    updateScissor();
    23372338#else

  • branches/vendor/nokia/qt/current/src/plugins/bearer/symbian/symbianengine.cpp

    r844 r863  
    830830            }
    831831        }
     832
    832833        if (active) {
    833834            changeConfigurationStateTo(ptr, QNetworkConfiguration::Active);

  • branches/vendor/nokia/qt/current/src/plugins/qpluginbase.pri

    r844 r863  
    11TEMPLATE = lib
    22isEmpty(QT_MAJOR_VERSION) {
    3    VERSION=4.7.2
     3   VERSION=4.7.
    44} else {
    55   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}

  • branches/vendor/nokia/qt/current/src/qbase.pri

    r844 r863  
    55TEMPLATE        = lib
    66isEmpty(QT_MAJOR_VERSION) {
    7    VERSION=4.7.2
     7   VERSION=4.7.
    88} else {
    99   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}

  • branches/vendor/nokia/qt/current/src/s60installs/bwins/QtDeclarativeu.def

    r844 r863  
    44        ?trUtf8@QDeclarativeExpression@@SA?AVQString@@PBD0H@Z @ 3 NONAME ; class QString QDeclarativeExpression::trUtf8(char const *, char const *, int)
    55        ?qt_metacast@QDeclarativeComponent@@UAEPAXPBD@Z @ 4 NONAME ; void * QDeclarativeComponent::qt_metacast(char const *)
    6         ?name@QDeclarativeDebugService@@QBE?AVQString@@XZ @ 5 NONAME ABSENT ; class QString QDeclarativeDebugService::name(void) const
     6        ?name@QDeclarativeDebugService@@QBE?AVQString@@XZ @ 5 NONAME ; class QString QDeclarativeDebugService::name(void) const
    77        ?debugId@QDeclarativeDebugObjectReference@@QBEHXZ @ 6 NONAME ABSENT ; int QDeclarativeDebugObjectReference::debugId(void) const
    88        ?addPluginPath@QDeclarativeEngine@@QAEXABVQString@@@Z @ 7 NONAME ; void QDeclarativeEngine::addPluginPath(class QString const &)
    … …  
    1212        ??0QDeclarativeText@@QAE@PAVQDeclarativeItem@@@Z @ 11 NONAME ABSENT ; QDeclarativeText::QDeclarativeText(class QDeclarativeItem *)
    1313        ?propertyTypeName@QDeclarativeProperty@@QBEPBDXZ @ 12 NONAME ; char const * QDeclarativeProperty::propertyTypeName(void) const
    14         ?getStaticMetaObject@QDeclarativeDebugService@@SAABUQMetaObject@@XZ @ 13 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDebugService::getStaticMetaObject(void)
     14        ?getStaticMetaObject@QDeclarativeDebugService@@SAABUQMetaObject@@XZ @ 13 NONAME ; struct QMetaObject const & QDeclarativeDebugService::getStaticMetaObject(void)
    1515        ?setLeft@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 14 NONAME ABSENT ; void QDeclarativeAnchors::setLeft(class QDeclarativeAnchorLine const &)
    1616        ?qt_metacall@QDeclarativeExpression@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 15 NONAME ; int QDeclarativeExpression::qt_metacall(enum QMetaObject::Call, int, void * *)
    … …  
    146146        ?enabled@QDeclarativeBinding@@QBE_NXZ @ 145 NONAME ABSENT ; bool QDeclarativeBinding::enabled(void) const
    147147        ?setSource@QDeclarativeView@@QAEXABVQUrl@@@Z @ 146 NONAME ; void QDeclarativeView::setSource(class QUrl const &)
    148         ??_EQDeclarativeDebugService@@UAE@I@Z @ 147 NONAME ABSENT ; QDeclarativeDebugService::~QDeclarativeDebugService(unsigned int)
     148        ??_EQDeclarativeDebugService@@UAE@I@Z @ 147 NONAME ; QDeclarativeDebugService::~QDeclarativeDebugService(unsigned int)
    149149        ??0QDeclarativeDomDynamicProperty@@QAE@ABV0@@Z @ 148 NONAME ABSENT ; QDeclarativeDomDynamicProperty::QDeclarativeDomDynamicProperty(class QDeclarativeDomDynamicProperty const &)
    150150        ?className@QDeclarativeDebugObjectReference@@QBE?AVQString@@XZ @ 149 NONAME ABSENT ; class QString QDeclarativeDebugObjectReference::className(void) const
    … …  
    295295        ?setName@QDeclarativeState@@QAEXABVQString@@@Z @ 294 NONAME ; void QDeclarativeState::setName(class QString const &)
    296296        ?setReversed@QDeclarativeTransition@@QAEX_N@Z @ 295 NONAME ; void QDeclarativeTransition::setReversed(bool)
    297         ?idForObject@QDeclarativeDebugService@@SAHPAVQObject@@@Z @ 296 NONAME ABSENT ; int QDeclarativeDebugService::idForObject(class QObject *)
     297        ?idForObject@QDeclarativeDebugService@@SAHPAVQObject@@@Z @ 296 NONAME ; int QDeclarativeDebugService::idForObject(class QObject *)
    298298        ?qt_metacall@QDeclarativeDebugWatch@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 297 NONAME ABSENT ; int QDeclarativeDebugWatch::qt_metacall(enum QMetaObject::Call, int, void * *)
    299299        ?fromState@QDeclarativeTransition@@QBE?AVQString@@XZ @ 298 NONAME ; class QString QDeclarativeTransition::fromState(void) const
    … …  
    333333        ??1QDeclarativeImageProvider@@UAE@XZ @ 332 NONAME ; QDeclarativeImageProvider::~QDeclarativeImageProvider(void)
    334334        ?sync@QDeclarativeListModel@@QAEXXZ @ 333 NONAME ABSENT ; void QDeclarativeListModel::sync(void)
    335         ?objectForId@QDeclarativeDebugService@@SAPAVQObject@@H@Z @ 334 NONAME ABSENT ; class QObject * QDeclarativeDebugService::objectForId(int)
     335        ?objectForId@QDeclarativeDebugService@@SAPAVQObject@@H@Z @ 334 NONAME ; class QObject * QDeclarativeDebugService::objectForId(int)
    336336        ?hasFocus@QDeclarativeItem@@QBE_NXZ @ 335 NONAME ; bool QDeclarativeItem::hasFocus(void) const
    337337        ??1QDeclarativeExtensionPlugin@@UAE@XZ @ 336 NONAME ; QDeclarativeExtensionPlugin::~QDeclarativeExtensionPlugin(void)
    … …  
    483483        ?parentContext@QDeclarativeContext@@QBEPAV1@XZ @ 482 NONAME ; class QDeclarativeContext * QDeclarativeContext::parentContext(void) const
    484484        ?leftMarginChanged@QDeclarativeAnchors@@IAEXXZ @ 483 NONAME ABSENT ; void QDeclarativeAnchors::leftMarginChanged(void)
    485         ?staticMetaObject@QDeclarativeDebugService@@2UQMetaObject@@B @ 484 NONAME ABSENT ; struct QMetaObject const QDeclarativeDebugService::staticMetaObject
     485        ?staticMetaObject@QDeclarativeDebugService@@2UQMetaObject@@B @ 484 NONAME ; struct QMetaObject const QDeclarativeDebugService::staticMetaObject
    486486        ?topMargin@QDeclarativeAnchors@@QBEMXZ @ 485 NONAME ABSENT ; float QDeclarativeAnchors::topMargin(void) const
    487487        ??0QDeclarativeDebugExpressionQuery@@AAE@PAVQObject@@@Z @ 486 NONAME ABSENT ; QDeclarativeDebugExpressionQuery::QDeclarativeDebugExpressionQuery(class QObject *)
    … …  
    560560        ??_EQDeclarativeDebugContextReference@@QAE@I@Z @ 559 NONAME ABSENT ; QDeclarativeDebugContextReference::~QDeclarativeDebugContextReference(unsigned int)
    561561        ?propertyWrite@QDeclarativeOpenMetaObject@@MAEXH@Z @ 560 NONAME ABSENT ; void QDeclarativeOpenMetaObject::propertyWrite(int)
    562         ?qt_metacall@QDeclarativeDebugService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 561 NONAME ABSENT ; int QDeclarativeDebugService::qt_metacall(enum QMetaObject::Call, int, void * *)
     562        ?qt_metacall@QDeclarativeDebugService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 561 NONAME ; int QDeclarativeDebugService::qt_metacall(enum QMetaObject::Call, int, void * *)
    563563        ?setVerticalCenterOffset@QDeclarativeAnchors@@QAEXM@Z @ 562 NONAME ABSENT ; void QDeclarativeAnchors::setVerticalCenterOffset(float)
    564564        ??1QDeclarativeDebugWatch@@UAE@XZ @ 563 NONAME ABSENT ; QDeclarativeDebugWatch::~QDeclarativeDebugWatch(void)
    … …  
    642642        ?binding@QDeclarativeDomValueBinding@@QBE?AVQString@@XZ @ 641 NONAME ABSENT ; class QString QDeclarativeDomValueBinding::binding(void) const
    643643        ?updateAutoState@QDeclarativeStateGroup@@AAE_NXZ @ 642 NONAME ; bool QDeclarativeStateGroup::updateAutoState(void)
    644         ?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 643 NONAME ABSENT ; class QString QDeclarativeDebugService::tr(char const *, char const *)
     644        ?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 643 NONAME ; class QString QDeclarativeDebugService::tr(char const *, char const *)
    645645        ?tr@QDeclarativeComponent@@SA?AVQString@@PBD0H@Z @ 644 NONAME ; class QString QDeclarativeComponent::tr(char const *, char const *, int)
    646646        ??1QDeclarativeProperty@@QAE@XZ @ 645 NONAME ; QDeclarativeProperty::~QDeclarativeProperty(void)
    … …  
    668668        ?setStdCppSet@QMetaPropertyBuilder@@QAEX_N@Z @ 667 NONAME ABSENT ; void QMetaPropertyBuilder::setStdCppSet(bool)
    669669        ??0QDeclarativeItemPrivate@@QAE@XZ @ 668 NONAME ; QDeclarativeItemPrivate::QDeclarativeItemPrivate(void)
    670         ??0QDeclarativeDebugService@@QAE@ABVQString@@PAVQObject@@@Z @ 669 NONAME ABSENT ; QDeclarativeDebugService::QDeclarativeDebugService(class QString const &, class QObject *)
     670        ??0QDeclarativeDebugService@@QAE@ABVQString@@PAVQObject@@@Z @ 669 NONAME ; QDeclarativeDebugService::QDeclarativeDebugService(class QString const &, class QObject *)
    671671        ?load@QDeclarativePixmap@@QAEXPAVQDeclarativeEngine@@ABVQUrl@@_N@Z @ 670 NONAME ; void QDeclarativePixmap::load(class QDeclarativeEngine *, class QUrl const &, bool)
    672672        ??_EQPacketAutoSend@@UAE@I@Z @ 671 NONAME ABSENT ; QPacketAutoSend::~QPacketAutoSend(unsigned int)
    … …  
    674674        ?resetHeight@QDeclarativeItem@@QAEXXZ @ 673 NONAME ; void QDeclarativeItem::resetHeight(void)
    675675        ?setVAlign@QDeclarativeText@@QAEXW4VAlignment@1@@Z @ 674 NONAME ABSENT ; void QDeclarativeText::setVAlign(enum QDeclarativeText::VAlignment)
    676         ??1QDeclarativeDebugService@@UAE@XZ @ 675 NONAME ABSENT ; QDeclarativeDebugService::~QDeclarativeDebugService(void)
    677         ?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0H@Z @ 676 NONAME ABSENT ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *, int)
     676        ??1QDeclarativeDebugService@@UAE@XZ @ 675 NONAME ; QDeclarativeDebugService::~QDeclarativeDebugService(void)
     677        ?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0H@Z @ 676 NONAME ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *, int)
    678678        ?elideMode@QDeclarativeText@@QBE?AW4TextElideMode@1@XZ @ 677 NONAME ABSENT ; enum QDeclarativeText::TextElideMode QDeclarativeText::elideMode(void) const
    679679        ?baseUrl@QDeclarativeContext@@QBE?AVQUrl@@XZ @ 678 NONAME ; class QUrl QDeclarativeContext::baseUrl(void) const
    … …  
    850850        ?qmlInfo@@YA?AVQDeclarativeInfo@@PBVQObject@@@Z @ 849 NONAME ; class QDeclarativeInfo qmlInfo(class QObject const *)
    851851        ?qt_metacall@QDeclarativeDebugClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 850 NONAME ABSENT ; int QDeclarativeDebugClient::qt_metacall(enum QMetaObject::Call, int, void * *)
    852         ?d_func@QDeclarativeDebugService@@ABEPBVQDeclarativeDebugServicePrivate@@XZ @ 851 NONAME ABSENT ; class QDeclarativeDebugServicePrivate const * QDeclarativeDebugService::d_func(void) const
     852        ?d_func@QDeclarativeDebugService@@ABEPBVQDeclarativeDebugServicePrivate@@XZ @ 851 NONAME ; class QDeclarativeDebugServicePrivate const * QDeclarativeDebugService::d_func(void) const
    853853        ??1QDeclarativeDebugQuery@@UAE@XZ @ 852 NONAME ABSENT ; QDeclarativeDebugQuery::~QDeclarativeDebugQuery(void)
    854854        ?data_append@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@PAVQObject@@@Z @ 853 NONAME ; void QDeclarativeItemPrivate::data_append(class QDeclarativeListProperty<class QObject> *, class QObject *)
    … …  
    11211121        ??4QDeclarativeDomList@@QAEAAV0@ABV0@@Z @ 1120 NONAME ABSENT ; class QDeclarativeDomList & QDeclarativeDomList::operator=(class QDeclarativeDomList const &)
    11221122        ?qt_metacall@QDeclarativeComponent@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1121 NONAME ; int QDeclarativeComponent::qt_metacall(enum QMetaObject::Call, int, void * *)
    1123         ?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0H@Z @ 1122 NONAME ABSENT ; class QString QDeclarativeDebugService::tr(char const *, char const *, int)
     1123        ?tr@QDeclarativeDebugService@@SA?AVQString@@PBD0H@Z @ 1122 NONAME ; class QString QDeclarativeDebugService::tr(char const *, char const *, int)
    11241124        ?staticMetaObject@QDeclarativeEngine@@2UQMetaObject@@B @ 1123 NONAME ; struct QMetaObject const QDeclarativeEngine::staticMetaObject
    11251125        ?staticMetaObject@QDeclarativeStateOperation@@2UQMetaObject@@B @ 1124 NONAME ; struct QMetaObject const QDeclarativeStateOperation::staticMetaObject
    … …  
    11461146        ??_EQDeclarativeAnchors@@UAE@I@Z @ 1145 NONAME ABSENT ; QDeclarativeAnchors::~QDeclarativeAnchors(unsigned int)
    11471147        ?removeNotifySignal@QMetaPropertyBuilder@@QAEXXZ @ 1146 NONAME ABSENT ; void QMetaPropertyBuilder::removeNotifySignal(void)
    1148         ?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 1147 NONAME ABSENT ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *)
     1148        ?trUtf8@QDeclarativeDebugService@@SA?AVQString@@PBD0@Z @ 1147 NONAME ; class QString QDeclarativeDebugService::trUtf8(char const *, char const *)
    11491149        ?setImportPathList@QDeclarativeEngine@@QAEXABVQStringList@@@Z @ 1148 NONAME ; void QDeclarativeEngine::setImportPathList(class QStringList const &)
    11501150        ?enabledChanged@QDeclarativeDebugService@@MAEX_N@Z @ 1149 NONAME ABSENT ; void QDeclarativeDebugService::enabledChanged(bool)
    … …  
    11771177        ??6QDeclarativeState@@QAEAAV0@PAVQDeclarativeStateOperation@@@Z @ 1176 NONAME ; class QDeclarativeState & QDeclarativeState::operator<<(class QDeclarativeStateOperation *)
    11781178        ?destroy@QDeclarativeAbstractBinding@@UAEXXZ @ 1177 NONAME ABSENT ; void QDeclarativeAbstractBinding::destroy(void)
    1179         ?qt_metacast@QDeclarativeDebugService@@UAEPAXPBD@Z @ 1178 NONAME ABSENT ; void * QDeclarativeDebugService::qt_metacast(char const *)
     1179        ?qt_metacast@QDeclarativeDebugService@@UAEPAXPBD@Z @ 1178 NONAME ; void * QDeclarativeDebugService::qt_metacast(char const *)
    11801180        ?qt_metacast@QDeclarativeValueType@@UAEPAXPBD@Z @ 1179 NONAME ABSENT ; void * QDeclarativeValueType::qt_metacast(char const *)
    11811181        ?childAt@QDeclarativeItem@@QBEPAV1@MM@Z @ 1180 NONAME ; class QDeclarativeItem * QDeclarativeItem::childAt(float, float) const
    … …  
    12981298        ?tr@QDeclarativeDebugRootContextQuery@@SA?AVQString@@PBD0H@Z @ 1297 NONAME ABSENT ; class QString QDeclarativeDebugRootContextQuery::tr(char const *, char const *, int)
    12991299        ?setFromState@QDeclarativeTransition@@QAEXABVQString@@@Z @ 1298 NONAME ; void QDeclarativeTransition::setFromState(class QString const &)
    1300         ?metaObject@QDeclarativeDebugService@@UBEPBUQMetaObject@@XZ @ 1299 NONAME ABSENT ; struct QMetaObject const * QDeclarativeDebugService::metaObject(void) const
     1300        ?metaObject@QDeclarativeDebugService@@UBEPBUQMetaObject@@XZ @ 1299 NONAME ; struct QMetaObject const * QDeclarativeDebugService::metaObject(void) const
    13011301        ?state@QDeclarativeDebugQuery@@QBE?AW4State@1@XZ @ 1300 NONAME ABSENT ; enum QDeclarativeDebugQuery::State QDeclarativeDebugQuery::state(void) const
    13021302        ?setBottom@QDeclarativeScaleGrid@@QAEXH@Z @ 1301 NONAME ABSENT ; void QDeclarativeScaleGrid::setBottom(int)
    … …  
    13061306        ?update@QDeclarativeBinding@@UAEXV?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 1305 NONAME ABSENT ; void QDeclarativeBinding::update(class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
    13071307        ?tr@QDeclarativeBehavior@@SA?AVQString@@PBD0@Z @ 1306 NONAME ABSENT ; class QString QDeclarativeBehavior::tr(char const *, char const *)
    1308         ?isDebuggingEnabled@QDeclarativeDebugService@@SA_NXZ @ 1307 NONAME ABSENT ; bool QDeclarativeDebugService::isDebuggingEnabled(void)
     1308        ?isDebuggingEnabled@QDeclarativeDebugService@@SA_NXZ @ 1307 NONAME ; bool QDeclarativeDebugService::isDebuggingEnabled(void)
    13091309        ?tr@QDeclarativeText@@SA?AVQString@@PBD0H@Z @ 1308 NONAME ABSENT ; class QString QDeclarativeText::tr(char const *, char const *, int)
    13101310        ?reset@QDeclarativeProperty@@QBE_NXZ @ 1309 NONAME ; bool QDeclarativeProperty::reset(void) const
    … …  
    13451345        ??_EQDeclarativeDebuggerStatus@@UAE@I@Z @ 1344 NONAME ABSENT ; QDeclarativeDebuggerStatus::~QDeclarativeDebuggerStatus(unsigned int)
    13461346        ?error@QDeclarativeCustomParser@@IAEXABVQString@@@Z @ 1345 NONAME ; void QDeclarativeCustomParser::error(class QString const &)
    1347         ?messageReceived@QDeclarativeDebugService@@MAEXABVQByteArray@@@Z @ 1346 NONAME ABSENT ; void QDeclarativeDebugService::messageReceived(class QByteArray const &)
     1347        ?messageReceived@QDeclarativeDebugService@@MAEXABVQByteArray@@@Z @ 1346 NONAME ; void QDeclarativeDebugService::messageReceived(class QByteArray const &)
    13481348        ??0QDeclarativeParserStatus@@QAE@XZ @ 1347 NONAME ; QDeclarativeParserStatus::QDeclarativeParserStatus(void)
    13491349        ?isNumber@Variant@QDeclarativeParser@@QBE_NXZ @ 1348 NONAME ; bool QDeclarativeParser::Variant::isNumber(void) const
    … …  
    14761476        ?getStaticMetaObject@QDeclarativeDebugObjectQuery@@SAABUQMetaObject@@XZ @ 1475 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDebugObjectQuery::getStaticMetaObject(void)
    14771477        ?isSignalProperty@QDeclarativeProperty@@QBE_NXZ @ 1476 NONAME ; bool QDeclarativeProperty::isSignalProperty(void) const
    1478         ?d_func@QDeclarativeDebugService@@AAEPAVQDeclarativeDebugServicePrivate@@XZ @ 1477 NONAME ABSENT ; class QDeclarativeDebugServicePrivate * QDeclarativeDebugService::d_func(void)
     1478        ?d_func@QDeclarativeDebugService@@AAEPAVQDeclarativeDebugServicePrivate@@XZ @ 1477 NONAME ; class QDeclarativeDebugServicePrivate * QDeclarativeDebugService::d_func(void)
    14791479        ?qmlTypeNames@QDeclarativeMetaType@@SA?AV?$QList@VQByteArray@@@@XZ @ 1478 NONAME ABSENT ; class QList<class QByteArray> QDeclarativeMetaType::qmlTypeNames(void)
    14801480        ?componentComplete@QDeclarativeItem@@MAEXXZ @ 1479 NONAME ; void QDeclarativeItem::componentComplete(void)
    … …  
    15761576        ??1QDeclarativeDomProperty@@QAE@XZ @ 1575 NONAME ABSENT ; QDeclarativeDomProperty::~QDeclarativeDomProperty(void)
    15771577        ?url@QDeclarativePixmap@@QBEABVQUrl@@XZ @ 1576 NONAME ; class QUrl const & QDeclarativePixmap::url(void) const
    1578         ?sendMessage@QDeclarativeDebugService@@QAEXABVQByteArray@@@Z @ 1577 NONAME ABSENT ; void QDeclarativeDebugService::sendMessage(class QByteArray const &)
     1578        ?sendMessage@QDeclarativeDebugService@@QAEXABVQByteArray@@@Z @ 1577 NONAME ; void QDeclarativeDebugService::sendMessage(class QByteArray const &)
    15791579        ?context@QDeclarativeScriptString@@QBEPAVQDeclarativeContext@@XZ @ 1578 NONAME ; class QDeclarativeContext * QDeclarativeScriptString::context(void) const
    15801580        ?queryObject@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugObjectQuery@@ABVQDeclarativeDebugObjectReference@@PAVQObject@@@Z @ 1579 NONAME ABSENT ; class QDeclarativeDebugObjectQuery * QDeclarativeEngineDebug::queryObject(class QDeclarativeDebugObjectReference const &, class QObject *)
    … …  
    16091609        ?get@QDeclarativeItemPrivate@@SAPAV1@PAVQDeclarativeItem@@@Z @ 1608 NONAME ; class QDeclarativeItemPrivate * QDeclarativeItemPrivate::get(class QDeclarativeItem *)
    16101610        ?staticMetaObject@QDeclarativeView@@2UQMetaObject@@B @ 1609 NONAME ; struct QMetaObject const QDeclarativeView::staticMetaObject
    1611         ?objectToString@QDeclarativeDebugService@@SA?AVQString@@PAVQObject@@@Z @ 1610 NONAME ABSENT ; class QString QDeclarativeDebugService::objectToString(class QObject *)
     1611        ?objectToString@QDeclarativeDebugService@@SA?AVQString@@PAVQObject@@@Z @ 1610 NONAME ; class QString QDeclarativeDebugService::objectToString(class QObject *)
    16121612        ?defaultValue@QDeclarativeDomDynamicProperty@@QBE?AVQDeclarativeDomProperty@@XZ @ 1611 NONAME ABSENT ; class QDeclarativeDomProperty QDeclarativeDomDynamicProperty::defaultValue(void) const
    16131613        ?relatedMetaObject@QMetaObjectBuilder@@QBEPBUQMetaObject@@H@Z @ 1612 NONAME ABSENT ; struct QMetaObject const * QMetaObjectBuilder::relatedMetaObject(int) const
    … …  
    16341634        ?qt_metacall@QPacketProtocol@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1633 NONAME ABSENT ; int QPacketProtocol::qt_metacall(enum QMetaObject::Call, int, void * *)
    16351635        ??0QDeclarativeItem@@QAE@PAV0@@Z @ 1634 NONAME ; QDeclarativeItem::QDeclarativeItem(class QDeclarativeItem *)
    1636         ?hasDebuggingClient@QDeclarativeDebugService@@SA_NXZ @ 1635 NONAME ABSENT ; bool QDeclarativeDebugService::hasDebuggingClient(void)
     1636        ?hasDebuggingClient@QDeclarativeDebugService@@SA_NXZ @ 1635 NONAME ; bool QDeclarativeDebugService::hasDebuggingClient(void)
    16371637        ?staticMetaObject@QDeclarativeContext@@2UQMetaObject@@B @ 1636 NONAME ; struct QMetaObject const QDeclarativeContext::staticMetaObject
    16381638        ?setContextForObject@QDeclarativeEngine@@SAXPAVQObject@@PAVQDeclarativeContext@@@Z @ 1637 NONAME ; void QDeclarativeEngine::setContextForObject(class QObject *, class QDeclarativeContext *)
    … …  
    17341734        ?transition@QDeclarativeAbstractAnimation@@UAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@W4TransitionDirection@1@@Z @ 1733 NONAME ABSENT ; void QDeclarativeAbstractAnimation::transition(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, enum QDeclarativeAbstractAnimation::TransitionDirection)
    17351735        ?componentComplete@QDeclarativeAbstractAnimation@@UAEXXZ @ 1734 NONAME ABSENT ; void QDeclarativeAbstractAnimation::componentComplete(void)
    1736         ?statusChanged@QDeclarativeDebugService@@MAEXW4Status@1@@Z @ 1735 NONAME ABSENT ; void QDeclarativeDebugService::statusChanged(enum QDeclarativeDebugService::Status)
     1736        ?statusChanged@QDeclarativeDebugService@@MAEXW4Status@1@@Z @ 1735 NONAME ; void QDeclarativeDebugService::statusChanged(enum QDeclarativeDebugService::Status)
    17371737        ?runningChanged@QDeclarativeAbstractAnimation@@IAEX_N@Z @ 1736 NONAME ABSENT ; void QDeclarativeAbstractAnimation::runningChanged(bool)
    17381738        ?trUtf8@QDeclarativeAbstractAnimation@@SA?AVQString@@PBD0H@Z @ 1737 NONAME ABSENT ; class QString QDeclarativeAbstractAnimation::trUtf8(char const *, char const *, int)
    … …  
    18141814        ?alwaysRunToEnd@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1813 NONAME ABSENT ; bool QDeclarativeAbstractAnimation::alwaysRunToEnd(void) const
    18151815        ?tr@QDeclarativeTimer@@SA?AVQString@@PBD0H@Z @ 1814 NONAME ABSENT ; class QString QDeclarativeTimer::tr(char const *, char const *, int)
    1816         ?status@QDeclarativeDebugService@@QBE?AW4Status@1@XZ @ 1815 NONAME ABSENT ; enum QDeclarativeDebugService::Status QDeclarativeDebugService::status(void) const
     1816        ?status@QDeclarativeDebugService@@QBE?AW4Status@1@XZ @ 1815 NONAME ; enum QDeclarativeDebugService::Status QDeclarativeDebugService::status(void) const
    18171817        ?intervalChanged@QDeclarativeTimer@@IAEXXZ @ 1816 NONAME ABSENT ; void QDeclarativeTimer::intervalChanged(void)
    18181818        ?isPaused@QDeclarativeAbstractAnimation@@QBE_NXZ @ 1817 NONAME ABSENT ; bool QDeclarativeAbstractAnimation::isPaused(void) const

  • branches/vendor/nokia/qt/current/src/s60installs/eabi/QtDeclarativeu.def

    r844 r863  
    762762        _ZN24QDeclarativeCustomParser5errorERK32QDeclarativeCustomParserPropertyRK7QString @ 761 NONAME
    763763        _ZN24QDeclarativeCustomParser5errorERK7QString @ 762 NONAME
    764         _ZN24QDeclarativeDebugService11idForObjectEP7QObject @ 763 NONAME ABSENT
    765         _ZN24QDeclarativeDebugService11objectForIdEi @ 764 NONAME ABSENT
    766         _ZN24QDeclarativeDebugService11qt_metacallEN11QMetaObject4CallEiPPv @ 765 NONAME ABSENT
    767         _ZN24QDeclarativeDebugService11qt_metacastEPKc @ 766 NONAME ABSENT
    768         _ZN24QDeclarativeDebugService11sendMessageERK10QByteArray @ 767 NONAME ABSENT
     764        _ZN24QDeclarativeDebugService11idForObjectEP7QObject @ 763 NONAME
     765        _ZN24QDeclarativeDebugService11objectForIdEi @ 764 NONAME
     766        _ZN24QDeclarativeDebugService11qt_metacallEN11QMetaObject4CallEiPPv @ 765 NONAME
     767        _ZN24QDeclarativeDebugService11qt_metacastEPKc @ 766 NONAME
     768        _ZN24QDeclarativeDebugService11sendMessageERK10QByteArray @ 767 NONAME
    769769        _ZN24QDeclarativeDebugService14enabledChangedEb @ 768 NONAME ABSENT
    770         _ZN24QDeclarativeDebugService14objectToStringEP7QObject @ 769 NONAME ABSENT
    771         _ZN24QDeclarativeDebugService15messageReceivedERK10QByteArray @ 770 NONAME ABSENT
    772         _ZN24QDeclarativeDebugService16staticMetaObjectE @ 771 NONAME DATA 16 ABSENT
    773         _ZN24QDeclarativeDebugService18hasDebuggingClientEv @ 772 NONAME ABSENT
    774         _ZN24QDeclarativeDebugService18isDebuggingEnabledEv @ 773 NONAME ABSENT
    775         _ZN24QDeclarativeDebugService19getStaticMetaObjectEv @ 774 NONAME ABSENT
    776         _ZN24QDeclarativeDebugServiceC1ERK7QStringP7QObject @ 775 NONAME ABSENT
    777         _ZN24QDeclarativeDebugServiceC2ERK7QStringP7QObject @ 776 NONAME ABSENT
     770        _ZN24QDeclarativeDebugService14objectToStringEP7QObject @ 769 NONAME
     771        _ZN24QDeclarativeDebugService15messageReceivedERK10QByteArray @ 770 NONAME
     772        _ZN24QDeclarativeDebugService16staticMetaObjectE @ 771 NONAME DATA 16
     773        _ZN24QDeclarativeDebugService18hasDebuggingClientEv @ 772 NONAME
     774        _ZN24QDeclarativeDebugService18isDebuggingEnabledEv @ 773 NONAME
     775        _ZN24QDeclarativeDebugService19getStaticMetaObjectEv @ 774 NONAME
     776        _ZN24QDeclarativeDebugServiceC1ERK7QStringP7QObject @ 775 NONAME
     777        _ZN24QDeclarativeDebugServiceC2ERK7QStringP7QObject @ 776 NONAME
    778778        _ZN24QDeclarativeDomComponentC1ERKS_ @ 777 NONAME ABSENT
    779779        _ZN24QDeclarativeDomComponentC1Ev @ 778 NONAME ABSENT
    … …  
    14261426        _ZNK24QDeclarativeCustomParser11resolveTypeERK10QByteArray @ 1425 NONAME
    14271427        _ZNK24QDeclarativeCustomParser12evaluateEnumERK10QByteArray @ 1426 NONAME
    1428         _ZNK24QDeclarativeDebugService10metaObjectEv @ 1427 NONAME ABSENT
    1429         _ZNK24QDeclarativeDebugService4nameEv @ 1428 NONAME ABSENT
     1428        _ZNK24QDeclarativeDebugService10metaObjectEv @ 1427 NONAME
     1429        _ZNK24QDeclarativeDebugService4nameEv @ 1428 NONAME
    14301430        _ZNK24QDeclarativeDebugService9isEnabledEv @ 1429 NONAME ABSENT
    14311431        _ZNK24QDeclarativeDomComponent13componentRootEv @ 1430 NONAME ABSENT
    … …  
    15551555        _ZTI23QDeclarativePropertyMap @ 1554 NONAME
    15561556        _ZTI24QDeclarativeCustomParser @ 1555 NONAME
    1557         _ZTI24QDeclarativeDebugService @ 1556 NONAME ABSENT
     1557        _ZTI24QDeclarativeDebugService @ 1556 NONAME
    15581558        _ZTI24QDeclarativeParserStatus @ 1557 NONAME
    15591559        _ZTI25QDeclarativeImageProvider @ 1558 NONAME
    … …  
    16051605        _ZTV23QDeclarativePropertyMap @ 1604 NONAME
    16061606        _ZTV24QDeclarativeCustomParser @ 1605 NONAME
    1607         _ZTV24QDeclarativeDebugService @ 1606 NONAME ABSENT
     1607        _ZTV24QDeclarativeDebugService @ 1606 NONAME
    16081608        _ZTV24QDeclarativeParserStatus @ 1607 NONAME
    16091609        _ZTV25QDeclarativeImageProvider @ 1608 NONAME
    … …  
    17781778        _ZN23QDeclarativeDebugClientD2Ev @ 1777 NONAME ABSENT
    17791779        _ZN23QDeclarativeEngineDebug13statusChangedENS_6StatusE @ 1778 NONAME ABSENT
    1780         _ZN24QDeclarativeDebugService13statusChangedENS_6StatusE @ 1779 NONAME ABSENT
    1781         _ZN24QDeclarativeDebugServiceD0Ev @ 1780 NONAME ABSENT
    1782         _ZN24QDeclarativeDebugServiceD1Ev @ 1781 NONAME ABSENT
    1783         _ZN24QDeclarativeDebugServiceD2Ev @ 1782 NONAME ABSENT
     1780        _ZN24QDeclarativeDebugService13statusChangedENS_6StatusE @ 1779 NONAME
     1781        _ZN24QDeclarativeDebugServiceD0Ev @ 1780 NONAME
     1782        _ZN24QDeclarativeDebugServiceD1Ev @ 1781 NONAME
     1783        _ZN24QDeclarativeDebugServiceD2Ev @ 1782 NONAME
    17841784        _ZN26QDeclarativeBasePositioner10addChangedEv @ 1783 NONAME ABSENT
    17851785        _ZN26QDeclarativeBasePositioner10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 1784 NONAME ABSENT
    … …  
    18521852        _ZNK23QDeclarativeDebugClient6statusEv @ 1851 NONAME ABSENT
    18531853        _ZNK23QDeclarativeEngineDebug6statusEv @ 1852 NONAME ABSENT
    1854         _ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME ABSENT
     1854        _ZNK24QDeclarativeDebugService6statusEv @ 1853 NONAME
    18551855        _ZNK26QDeclarativeBasePositioner10metaObjectEv @ 1854 NONAME ABSENT
    18561856        _ZNK26QDeclarativeBasePositioner3addEv @ 1855 NONAME ABSENT

  • branches/vendor/nokia/qt/current/tools/assistant/tools/assistant/doc/assistant.qdocconf

    r844 r863  
    1111HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
    1212              "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
    13               "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
     13              "<td width=\"30%\" align=\"left\">Copyright &copy; 201 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
    1414              "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
    15               "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.7.2</div></td>\n" \
     15              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.7.</div></td>\n" \
    1616              "</tr></table></div></address>"

  • branches/vendor/nokia/qt/current/tools/doxygen/config/phonon.doxyfile

    r844 r863  
    66#---------------------------------------------------------------------------
    77PROJECT_NAME           = Qt
    8 PROJECT_NUMBER         = 4.7.2
     8PROJECT_NUMBER         = 4.7.
    99OUTPUT_DIRECTORY       = doc
    1010CREATE_SUBDIRS         = NO

  • branches/vendor/nokia/qt/current/tools/qdoc3/doc/files/qt.qdocconf

    r844 r863  
    77project                 = Qt
    88versionsym              =
    9 version                 = 4.7.2
     9version                 = 4.7.
    1010description             = Qt Reference Documentation
    1111url                     = http://qt.nokia.com/doc/4.7
    … …  
    2323
    2424qhp.Qt.file                = qt.qhp
    25 qhp.Qt.namespace           = com.trolltech.qt.472
     25qhp.Qt.namespace           = com.trolltech.qt.47
    2626qhp.Qt.virtualFolder       = qdoc
    2727qhp.Qt.indexTitle          = Qt Reference Documentation
    … …  
    3737                             images/stylesheet-coffee-plastique.png
    3838
    39 qhp.Qt.filterAttributes    = qt 4.7.2 qtrefdoc
    40 qhp.Qt.customFilters.Qt.name = Qt 4.7.2
    41 qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.2
     39qhp.Qt.filterAttributes    = qt 4.7. qtrefdoc
     40qhp.Qt.customFilters.Qt.name = Qt 4.7.
     41qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.
    4242qhp.Qt.subprojects         = classes overviews examples
    4343qhp.Qt.subprojects.classes.title = Classes

  • branches/vendor/nokia/qt/current/tools/qdoc3/doc/qdoc-manual.qdoc

    r844 r863  
    80148014
    80158015           \code
    8016            #define QT_VERSION_STR "4.7.2"
     8016           #define QT_VERSION_STR "4.7."
    80178017           \endcode
    80188018

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/assistant.qdocconf

    r844 r863  
    1414
    1515qhp.Assistant.file                = assistant.qhp
    16 qhp.Assistant.namespace           = com.trolltech.assistant.472
     16qhp.Assistant.namespace           = com.trolltech.assistant.47
    1717qhp.Assistant.virtualFolder       = qdoc
    1818qhp.Assistant.indexTitle          = Qt Assistant Manual
    … …  
    5151                                    style/style.css
    5252
    53 qhp.Assistant.filterAttributes    = qt 4.7.2 tools assistant
     53qhp.Assistant.filterAttributes    = qt 4.7. tools assistant
    5454qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
    5555qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/designer.qdocconf

    r844 r863  
    1414
    1515qhp.Designer.file                = designer.qhp
    16 qhp.Designer.namespace           = com.trolltech.designer.472
     16qhp.Designer.namespace           = com.trolltech.designer.47
    1717qhp.Designer.virtualFolder       = qdoc
    1818qhp.Designer.indexTitle          = Qt Designer Manual
    … …  
    5151                                    style/style.css
    5252
    53 qhp.Designer.filterAttributes    = qt 4.7.2 tools designer
     53qhp.Designer.filterAttributes    = qt 4.7. tools designer
    5454qhp.Designer.customFilters.Designer.name = Qt Designer Manual
    5555qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/linguist.qdocconf

    r844 r863  
    1414
    1515qhp.Linguist.file                = linguist.qhp
    16 qhp.Linguist.namespace           = com.trolltech.linguist.472
     16qhp.Linguist.namespace           = com.trolltech.linguist.47
    1717qhp.Linguist.virtualFolder       = qdoc
    1818qhp.Linguist.indexTitle          = Qt Linguist Manual
    … …  
    5151                                    style/style.css
    5252
    53 qhp.Linguist.filterAttributes    = qt 4.7.2 tools linguist
     53qhp.Linguist.filterAttributes    = qt 4.7. tools linguist
    5454qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
    5555qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/qdeclarative.qdocconf

    r844 r863  
    2222
    2323qhp.Qml.file                = qml.qhp
    24 qhp.Qml.namespace           = com.trolltech.qml.472
     24qhp.Qml.namespace           = com.trolltech.qml.47
    2525qhp.Qml.virtualFolder       = qdoc
    2626qhp.Qml.indexTitle          = Qml Reference
    … …  
    6262                             style/style.css
    6363
    64 qhp.Qml.filterAttributes    = qt 4.7.2 qtrefdoc
    65 qhp.Qml.customFilters.Qt.name = Qt 4.7.2
    66 qhp.Qml.customFilters.Qt.filterAttributes = qt 4.7.2
     64qhp.Qml.filterAttributes    = qt 4.7. qtrefdoc
     65qhp.Qml.customFilters.Qt.name = Qt 4.7.
     66qhp.Qml.customFilters.Qt.filterAttributes = qt 4.7.
    6767qhp.Qml.subprojects         = classes
    6868qhp.Qml.subprojects.classes.title = Elements

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/qmake.qdocconf

    r844 r863  
    1414
    1515qhp.qmake.file                = qmake.qhp
    16 qhp.qmake.namespace           = com.trolltech.qmake.472
     16qhp.qmake.namespace           = com.trolltech.qmake.47
    1717qhp.qmake.virtualFolder       = qdoc
    1818qhp.qmake.indexTitle          = QMake Manual
    … …  
    5151                             style/style.css
    5252
    53 qhp.qmake.filterAttributes    = qt 4.7.2 tools qmake
     53qhp.qmake.filterAttributes    = qt 4.7. tools qmake
    5454qhp.qmake.customFilters.qmake.name = qmake Manual
    5555qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf

    r844 r863  
    1818
    1919qhp.Qt.file                = qt.qhp
    20 qhp.Qt.namespace           = com.trolltech.qt.472
     20qhp.Qt.namespace           = com.trolltech.qt.47
    2121qhp.Qt.virtualFolder       = qdoc
    2222qhp.Qt.title               = Qt
    … …  
    2424qhp.Qt.selectors           = fake:example
    2525
    26 qhp.Qt.filterAttributes    = qt 4.7.2 qtrefdoc ja_JP
    27 qhp.Qt.customFilters.Qt.name = Qt 4.7.2
    28 qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.2
     26qhp.Qt.filterAttributes    = qt 4.7. qtrefdoc ja_JP
     27qhp.Qt.customFilters.Qt.name = Qt 4.7.
     28qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.
    2929
    3030# Files not referenced in any qdoc file (last four are needed by qtdemo)

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf

    r844 r863  
    1818
    1919qhp.Qt.file                = qt.qhp
    20 qhp.Qt.namespace           = com.trolltech.qt.472
     20qhp.Qt.namespace           = com.trolltech.qt.47
    2121qhp.Qt.virtualFolder       = qdoc
    2222qhp.Qt.title               = 教皋
    … …  
    2424qhp.Qt.selectors           = fake:example
    2525
    26 qhp.Qt.filterAttributes    = qt 4.7.2 qtrefdoc zh_CN
    27 qhp.Qt.customFilters.Qt.name = Qt 4.7.2
    28 qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.2
     26qhp.Qt.filterAttributes    = qt 4.7. qtrefdoc zh_CN
     27qhp.Qt.customFilters.Qt.name = Qt 4.7.
     28qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.
    2929
    3030# Files not referenced in any qdoc file (last four are needed by qtdemo)

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/qt.qdocconf

    r844 r863  
    77project                 = Qt
    88versionsym              =
    9 version                 = 4.7.2
     9version                 = 4.7.
    1010description             = Qt Reference Documentation
    1111url                     = http://qt.nokia.com/doc/4.7

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/qt_ja_JP.qdocconf

    r844 r863  
    77project                 = Qt
    88versionsym              =
    9 version                 = 4.7.2
     9version                 = 4.7.
    1010description             = Qt リファレンスドキュメント
    1111url                     = http://qt.nokia.com/doc/ja_JP/4.7

  • branches/vendor/nokia/qt/current/tools/qdoc3/test/qt_zh_CN.qdocconf

    r844 r863  
    77project                 = Qt
    88versionsym              =
    9 version                 = 4.7.2
     9version                 = 4.7.
    1010description             = Qt Reference Documentation
    1111url                     = http://qt.nokia.com/doc/zh_CN/4.7
Note: See TracChangeset for help on using the changeset viewer.