Changeset 846 for trunk/tools/shared


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:
9 deleted
59 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/shared/deviceskin/deviceskin.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/tools/shared/deviceskin/deviceskin.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/tools/shared/deviceskin/deviceskin.pri

    r561 r846  
    33SOURCES += $$PWD/deviceskin.cpp
    44RESOURCES += $$PWD/skins/ClamshellPhone.qrc \
    5     $$PWD/skins/PDAPhone.qrc \
    65    $$PWD/skins/SmartPhone2.qrc \
    76    $$PWD/skins/SmartPhone.qrc \
    87    $$PWD/skins/SmartPhoneWithButtons.qrc \
    98    $$PWD/skins/TouchscreenPhone.qrc \
    10     $$PWD/skins/Trolltech-Keypad.qrc \
    11     $$PWD/skins/Trolltech-Touchscreen.qrc \
    129    $$PWD/skins/PortableMedia.qrc \
    1310    $$PWD/skins/S60-QVGA-Candybar.qrc \

  • trunk/tools/shared/findwidget/abstractfindwidget.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/tools/shared/findwidget/abstractfindwidget.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/tools/shared/findwidget/itemviewfindwidget.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/tools/shared/findwidget/itemviewfindwidget.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/tools/shared/findwidget/texteditfindwidget.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/tools/shared/findwidget/texteditfindwidget.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/tools/shared/fontpanel/fontpanel.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)
    … …  
    9797    rc.setPointSize(pointSize());
    9898    const QString styleDescription = styleString();
    99     rc.setItalic(m_fontDatabase.italic(family, styleDescription));
    100 
     99    if (styleDescription.contains(QLatin1String("Italic")))
     100        rc.setStyle(QFont::StyleItalic);
     101    else if (styleDescription.contains(QLatin1String("Oblique")))
     102        rc.setStyle(QFont::StyleOblique);
     103    else
     104        rc.setStyle(QFont::StyleNormal);
    101105    rc.setBold(m_fontDatabase.bold(family, styleDescription));
    102106

  • trunk/tools/shared/fontpanel/fontpanel.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/tools/shared/qtgradienteditor/qtcolorbutton.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/tools/shared/qtgradienteditor/qtcolorbutton.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/tools/shared/qtgradienteditor/qtcolorline.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/tools/shared/qtgradienteditor/qtcolorline.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/tools/shared/qtgradienteditor/qtgradientdialog.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/tools/shared/qtgradienteditor/qtgradientdialog.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/tools/shared/qtgradienteditor/qtgradientdialog.ui

    r651 r846  
    22 <comment>*********************************************************************
    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/tools/shared/qtgradienteditor/qtgradienteditor.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/tools/shared/qtgradienteditor/qtgradienteditor.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/tools/shared/qtgradienteditor/qtgradienteditor.ui

    r651 r846  
    22 <comment>*********************************************************************
    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/tools/shared/qtgradienteditor/qtgradientmanager.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/tools/shared/qtgradienteditor/qtgradientmanager.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/tools/shared/qtgradienteditor/qtgradientstopscontroller.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/tools/shared/qtgradienteditor/qtgradientstopscontroller.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/tools/shared/qtgradienteditor/qtgradientstopsmodel.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/tools/shared/qtgradienteditor/qtgradientstopsmodel.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/tools/shared/qtgradienteditor/qtgradientstopswidget.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/tools/shared/qtgradienteditor/qtgradientstopswidget.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/tools/shared/qtgradienteditor/qtgradientutils.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/tools/shared/qtgradienteditor/qtgradientutils.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/tools/shared/qtgradienteditor/qtgradientview.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/tools/shared/qtgradienteditor/qtgradientview.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/tools/shared/qtgradienteditor/qtgradientviewdialog.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/tools/shared/qtgradienteditor/qtgradientviewdialog.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/tools/shared/qtgradienteditor/qtgradientviewdialog.ui

    r651 r846  
    22 <comment>*********************************************************************
    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/tools/shared/qtgradienteditor/qtgradientwidget.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/tools/shared/qtgradienteditor/qtgradientwidget.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/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.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/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.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/tools/shared/qtpropertybrowser/qteditorfactory.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/tools/shared/qtpropertybrowser/qteditorfactory.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/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.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/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.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/tools/shared/qtpropertybrowser/qtpropertybrowser.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/tools/shared/qtpropertybrowser/qtpropertybrowser.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/tools/shared/qtpropertybrowser/qtpropertybrowserutils.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/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.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/tools/shared/qtpropertybrowser/qtpropertymanager.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)
    … …  
    24002400        return QString();
    24012401
    2402     QLocale loc = it.value();
     2402    const QLocale loc = it.value();
    24032403
    24042404    int langIdx = 0;
    24052405    int countryIdx = 0;
    2406     metaEnumProvider()->localeToIndex(loc.language(), loc.country(), &langIdx, &countryIdx);
    2407     QString str = tr("%1, %2")
    2408             .arg(metaEnumProvider()->languageEnumNames().at(langIdx))
    2409             .arg(metaEnumProvider()->countryEnumNames(loc.language()).at(countryIdx));
    2410     return str;
     2406    const QtMetaEnumProvider *me = metaEnumProvider();
     2407    me->localeToIndex(loc.language(), loc.country(), &langIdx, &countryIdx);
     2408    if (langIdx < 0) {
     2409        qWarning("QtLocalePropertyManager::valueText: Unknown language %d", loc.language());
     2410        return tr("<Invalid>");
     2411    }
     2412    const QString languageName = me->languageEnumNames().at(langIdx);
     2413    if (countryIdx < 0) {
     2414        qWarning("QtLocalePropertyManager::valueText: Unknown country %d for %s", loc.country(), qPrintable(languageName));
     2415        return languageName;
     2416    }
     2417    const QString countryName = me->countryEnumNames(loc.language()).at(countryIdx);
     2418    return tr("%1, %2").arg(languageName, countryName);
    24112419}
    24122420
    … …  
    26362644        return QString();
    26372645    const QPoint v = it.value();
    2638     return QString(tr("(%1, %2)").arg(QString::number(v.x()))
    2639                                  .arg(QString::number(v.y())));
     2646    return tr("(%1, %2)").arg(QString::number(v.x()))
     2647                         .arg(QString::number(v.y()));
    26402648}
    26412649
    … …  
    28772885    const QPointF v = it.value().val;
    28782886    const int dec =  it.value().decimals;
    2879     return QString(tr("(%1, %2)").arg(QString::number(v.x(), 'f', dec))
    2880                                  .arg(QString::number(v.y(), 'f', dec)));
     2887    return tr("(%1, %2)").arg(QString::number(v.x(), 'f', dec))
     2888                         .arg(QString::number(v.y(), 'f', dec));
    28812889}
    28822890
    … …  
    31973205        return QString();
    31983206    const QSize v = it.value().val;
    3199     return QString(tr("%1 x %2").arg(QString::number(v.width()))
    3200                                 .arg(QString::number(v.height())));
     3207    return tr("%1 x %2").arg(QString::number(v.width()))
     3208                        .arg(QString::number(v.height()));
    32013209}
    32023210
    … …  
    35623570    const QSizeF v = it.value().val;
    35633571    const int dec = it.value().decimals;
    3564     return QString(tr("%1 x %2").arg(QString::number(v.width(), 'f', dec))
    3565                                 .arg(QString::number(v.height(), 'f', dec)));
     3572    return tr("%1 x %2").arg(QString::number(v.width(), 'f', dec))
     3573                        .arg(QString::number(v.height(), 'f', dec));
    35663574}
    35673575
    … …  
    39553963        return QString();
    39563964    const QRect v = it.value().val;
    3957     return QString(tr("[(%1, %2), %3 x %4]").arg(QString::number(v.x()))
    3958                                 .arg(QString::number(v.y()))
    3959                                 .arg(QString::number(v.width()))
    3960                                 .arg(QString::number(v.height())));
     3965    return tr("[(%1, %2), %3 x %4]").arg(QString::number(v.x()))
     3966                                    .arg(QString::number(v.y()))
     3967                                    .arg(QString::number(v.width()))
     3968                                    .arg(QString::number(v.height()));
    39613969}
    39623970

  • trunk/tools/shared/qtpropertybrowser/qtpropertymanager.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/tools/shared/qtpropertybrowser/qttreepropertybrowser.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/tools/shared/qtpropertybrowser/qttreepropertybrowser.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/tools/shared/qtpropertybrowser/qtvariantproperty.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/tools/shared/qtpropertybrowser/qtvariantproperty.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/tools/shared/qttoolbardialog/qttoolbardialog.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/tools/shared/qttoolbardialog/qttoolbardialog.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/tools/shared/symbian/epocroot.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)
    … …  
    4040****************************************************************************/
    4141
    42 #include <iostream>
    43 
    4442#include <QtCore/qdir.h>
    4543#include <QtCore/qxmlstream.h>
    4644
    47 #include "epocroot.h"
    48 #include "../windows/registry.h"
     45#include "epocroot_p.h"
     46#include "../windows/registry_p.h"
     47
     48QT_BEGIN_NAMESPACE
    4949
    5050// Registry key under which the location of the Symbian devices.xml file is
    … …  
    6565static QString epocRootValue;
    6666
    67 #ifdef QT_BUILD_QMAKE
    68 std::ostream &operator<<(std::ostream &s, const QString &val) {
    69     s << val.toLocal8Bit().data();
    70     return s;
    71 }
    72 #else
    73 // Operator implemented in configureapp.cpp
    74 std::ostream &operator<<(std::ostream &s, const QString &val);
    75 #endif
    76 
    77 QString getDevicesXmlPath()
     67static QString getDevicesXmlPath()
    7868    {
    7969    // Note that the following call will return a null string on platforms other
    … …  
    8171    // an alternative mechanism for retrieving the location of this file will
    8272    // be required.
    83     return readRegistryKey(SYMBIAN_SDKS_REG_HANDLE, SYMBIAN_SDKS_REG_SUBKEY);
     73    return qt_readRegistryKey(SYMBIAN_SDKS_REG_HANDLE, QLatin1String(SYMBIAN_SDKS_REG_SUBKEY));
    8474    }
    8575
    … …  
    8878 * If not, epocRootValue is set to an empty string and an error message is printed.
    8979 */
    90 void checkEpocRootExists(const QString &source)
     80static void checkEpocRootExists(const QString &source)
    9181{
    9282    if (!epocRootValue.isEmpty()) {
    9383        QDir dir(epocRootValue);
    9484        if (!dir.exists()) {
    95             std::cerr << "Warning: " << source << " is set to an invalid path: " << epocRootValue << std::endl;
     85            qWarning("Warning: %s is set to an invalid path: '%s'", qPrintable(source),
     86                     qPrintable(epocRootValue));
    9687            epocRootValue = QString();
    9788        }
    … …  
    10495static void fixEpocRoot(QString &path)
    10596{
    106     path.replace("\\", "/");
    107 
    108     if (path.size() > 1 && path[1] == QChar(':')) {
    109         path = path.mid(2);
    110     }
    111 
    112     if (!path.size() || path[path.size()-1] != QChar('/')) {
    113         path += QChar('/');
     97    path.replace(QLatin1Char('\\'), QLatin1Char('/'));
     98
     99    if (!path.size() || path[path.size()-1] != QLatin1Char('/')) {
     100        path += QLatin1Char('/');
    114101    }
    115102}
    … …  
    118105 * Determine the epoc root for the currently active SDK.
    119106 */
    120 QString epocRoot()
     107QString qt_epocRoot()
    121108{
    122109    if (epocRootValue.isEmpty()) {
    123110        // 1. If environment variable EPOCROOT is set and points to an existent
    124111        //    directory, this is returned.
    125         epocRootValue = qgetenv("EPOCROOT");
    126         checkEpocRootExists("EPOCROOT");
     112        epocRootValue = QString::fromLocal8Bit(qgetenv("EPOCROOT").constData());
     113        checkEpocRootExists(QLatin1String("EPOCROOT environment variable"));
    127114
    128115        if (epocRootValue.isEmpty()) {
    … …  
    130117            //    file exists, it is parsed.
    131118            QString devicesXmlPath = getDevicesXmlPath();
    132             if (devicesXmlPath.isEmpty()) {
    133                 std::cerr << "Error: Symbian SDK registry key not found" << std::endl;
    134             } else {
    135                 devicesXmlPath += "/devices.xml";
     119            if (!devicesXmlPath.isEmpty()) {
     120                devicesXmlPath += QLatin1String("/devices.xml");
    136121                QFile devicesFile(devicesXmlPath);
    137122                if (devicesFile.open(QIODevice::ReadOnly)) {
    … …  
    143128                    //    epocroot value points to an existent directory, this is returned.
    144129
    145                     const QString epocDeviceValue = qgetenv("EPOCDEVICE");
     130                    const QString epocDeviceValue = QString::fromLocal8Bit(qgetenv("EPOCDEVICE").constData());
    146131                    bool epocDeviceFound = false;
    147132
    … …  
    149134                    while (!xml.atEnd()) {
    150135                        xml.readNext();
    151                         if (xml.isStartElement() && xml.name() == "devices") {
    152                             if (xml.attributes().value("version") == "1.0") {
    153                                 while (!(xml.isEndElement() && xml.name() == "devices") && !xml.atEnd()) {
     136                        if (xml.isStartElement() && xml.name() == QLatin1String("devices")) {
     137                            if (xml.attributes().value(QLatin1String("version")) == QLatin1String("1.0")) {
     138                                while (!(xml.isEndElement() && xml.name() == QLatin1String("devices")) && !xml.atEnd()) {
    154139                                    xml.readNext();
    155                                     if (xml.isStartElement() && xml.name() == "device") {
    156                                         const bool isDefault =  xml.attributes().value("default") == "yes";
    157                                         const QString id = xml.attributes().value("id").toString();
    158                                         const QString name =  xml.attributes().value("name").toString();
    159                                         const bool epocDeviceMatch = (id + ":" + name) == epocDeviceValue;
     140                                    if (xml.isStartElement() && xml.name() == QLatin1String("device")) {
     141                                        const bool isDefault = xml.attributes().value(QLatin1String("default")) == QLatin1String("yes");
     142                                        const QString id = xml.attributes().value(QLatin1String("id")).toString();
     143                                        const QString name = xml.attributes().value(QLatin1String("name")).toString();
     144                                        const QString alias = xml.attributes().value(QLatin1String("alias")).toString();
     145                                        bool epocDeviceMatch = QString(id + QLatin1String(":") + name) == epocDeviceValue;
     146                                        if (!alias.isEmpty())
     147                                            epocDeviceMatch |= alias == epocDeviceValue;
    160148                                        epocDeviceFound |= epocDeviceMatch;
    161149
    162150                                        if((epocDeviceValue.isEmpty() && isDefault) || epocDeviceMatch) {
    163151                                            // Found a matching device
    164                                             while (!(xml.isEndElement() && xml.name() == "device") && !xml.atEnd()) {
     152                                            while (!(xml.isEndElement() && xml.name() == QLatin1String("device")) && !xml.atEnd()) {
    165153                                                xml.readNext();
    166                                                 if (xml.isStartElement() && xml.name() == "epocroot") {
     154                                                if (xml.isStartElement() && xml.name() == QLatin1String("epocroot")) {
    167155                                                    epocRootValue = xml.readElementText();
    168156                                                    const QString deviceSource = epocDeviceValue.isEmpty()
    169                                                         ? "default device"
    170                                                         : "EPOCDEVICE (" + epocDeviceValue + ")";
     157                                                        ? QLatin1String("default device")
     158                                                        : QString(QLatin1String("EPOCDEVICE (") + epocDeviceValue + QLatin1String(")"));
    171159                                                    checkEpocRootExists(deviceSource);
    172160                                                }
    … …  
    174162
    175163                                            if (epocRootValue.isEmpty())
    176                                                 xml.raiseError("No epocroot element found");
     164                                                xml.raiseError(QLatin1String("No epocroot element found"));
    177165                                        }
    178166                                    }
    179167                                }
    180168                            } else {
    181                                 xml.raiseError("Invalid 'devices' element version");
     169                                xml.raiseError(QLatin1String("Invalid 'devices' element version"));
    182170                            }
    183171                        }
    184172                    }
    185173                    if (xml.hasError()) {
    186                         std::cerr << "Error: \"" << xml.errorString() << "\" when parsing devices.xml" << std::endl;
     174                        qWarning("Warning: Error \"%s\" when parsing devices.xml",
     175                                 qPrintable(xml.errorString()));
    187176                    } else {
    188177                        if (epocRootValue.isEmpty()) {
    189178                            if (!epocDeviceValue.isEmpty()) {
    190179                                if (epocDeviceFound) {
    191                                     std::cerr << "Error: missing or invalid epocroot attribute "
    192                                               << "in device '" << epocDeviceValue << "'";
     180                                    qWarning("Warning: Missing or invalid epocroot attribute in device '%s' in devices.xml.",
     181                                             qPrintable(epocDeviceValue));
    193182                                } else {
    194                                     std::cerr << "Error: no device matching EPOCDEVICE ("
    195                                               << epocDeviceValue << ")";
     183                                    qWarning("Warning: No device matching EPOCDEVICE (%s) in devices.xml.",
     184                                             qPrintable(epocDeviceValue));
    196185                                }
    197186                            } else {
    198187                                if (epocDeviceFound) {
    199                                     std::cerr << "Error: missing or invalid epocroot attribute "
    200                                               << "in default device";
     188                                    qWarning("Warning: Missing or invalid epocroot attribute in default device in devices.xml.");
    201189                                } else {
    202                                     std::cerr << "Error: no default device";
     190                                    qWarning("Warning: No default device set in devices.xml.");
    203191                                }
    204192                            }
    205                             std::cerr << " found in devices.xml file." << std::endl;
    206193                        }
    207194                    }
    208195                } else {
    209                     std::cerr << "Error: could not open file " << devicesXmlPath << std::endl;
     196                    qWarning("Warning: Could not open file: '%s'.", qPrintable(devicesXmlPath));
    210197                }
    211198            }
    … …  
    214201        if (epocRootValue.isEmpty()) {
    215202            // 5. An empty string is returned.
    216             std::cerr << "Error: failed to find epoc root" << std::endl
    217                  << "Either" << std::endl
    218                  << "    1. Set EPOCROOT environment variable to a valid value" << std::endl
    219                  << " or 2. Ensure that the HKEY_LOCAL_MACHINE\\" SYMBIAN_SDKS_REG_SUBKEY
    220                     " registry key is set, and then" << std::endl
    221                  << "       a. Set EPOCDEVICE environment variable to a valid device" << std::endl
    222                  << "    or b. Specify a default device in the devices.xml file." << std::endl;
     203            qWarning("Warning: failed to resolve epocroot."
     204#ifdef Q_OS_WIN32
     205                     "\nEither\n"
     206                     "    1. Set EPOCROOT environment variable to a valid value.\n"
     207                     " or 2. Ensure that the HKEY_LOCAL_MACHINE\\" SYMBIAN_SDKS_REG_SUBKEY
     208                     " registry key is set, and then\n"
     209                     "       a. Set EPOCDEVICE environment variable to a valid device\n"
     210                     "    or b. Specify a default device in the devices.xml file.");
     211#else
     212                     " Set EPOCROOT environment variable to a valid value.");
     213#endif
    223214        } else {
    224215            fixEpocRoot(epocRootValue);
    … …  
    229220}
    230221
     222QT_END_NAMESPACE

  • trunk/tools/shared/windows/registry.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)
    … …  
    4141
    4242#include <QtCore/qstringlist.h>
    43 #include "registry.h"
     43#include "registry_p.h"
    4444
     45QT_BEGIN_NAMESPACE
     46
     47#ifdef Q_OS_WIN32
    4548/*!
    4649  Returns the path part of a registry key.
    … …  
    7477
    7578    QString res(rKey.mid(idx + 1));
    76     if (res == "Default" || res == ".")
    77         res = "";
     79    if (res == QLatin1String("Default") || res == QLatin1String("."))
     80        res = QString();
    7881    return res;
    7982}
     83#endif
    8084
    81 QString readRegistryKey(HKEY parentHandle, const QString &rSubkey)
     85QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey)
    8286{
    8387    QString result;
    … …  
    129133                l.append(s);
    130134            }
    131             result = l.join(", ");
     135            result = l.join(QLatin1String(", "));
    132136            break;
    133137        }
    … …  
    149153
    150154        default:
    151             qWarning("QSettings: unknown data %d type in windows registry", dataType);
     155            qWarning("QSettings: unknown data %u type in windows registry", quint32(dataType));
    152156            break;
    153157    }
    154158
    155159    RegCloseKey(handle);
     160#else
     161    Q_UNUSED(parentHandle);
     162    Q_UNUSED(rSubkey)
    156163#endif
    157164
    … …  
    159166}
    160167
     168QT_END_NAMESPACE
    161169
Note: See TracChangeset for help on using the changeset viewer.