Changeset 556 for branches/vendor/nokia/qt/current/src/plugins

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/q3complexwidgets.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
         case 3:
             if (window && window->isMinimized())
                 return Q3TitleBar::tr("Puts a minimized back to normal");
+                return Q3TitleBar::tr("Puts a minimized back to normal");
             return Q3TitleBar::tr("Moves the window out of the way");
         case 4:

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/q3complexwidgets.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/q3simplewidgets.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/q3simplewidgets.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/qaccessiblecompat.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/qaccessiblecompat.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/complexwidgets.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/complexwidgets.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     } else if (classname == QLatin1String("QStatusBar")) {
         iface = new QAccessibleWidgetEx(widget, StatusBar);
     } else if (classname == QLatin1String("QProgressBar")) {
+        iface = new QAccessibleDisplay(widget);
+        iface = new QAccessibleProgressBar(widget);
+#endif
     } else if (classname == QLatin1String("QToolBar")) {
         iface = new QAccessibleWidgetEx(widget, ToolBar, widget->windowTitle());

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/qaccessiblemenu.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/qaccessiblemenu.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/qaccessiblewidgets.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/qaccessiblewidgets.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/rangecontrols.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QString QAccessibleSlider::actionText(int /*action*/, Text /*t*/, int /*child*/) const
+{
     return QString(QLatin1String(""));
+    return Q);
+}

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/rangecontrols.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 class QAccessibleAbstractSpinBox: public QAccessibleWidgetEx, public QAccessibleValueInterface
+{
 public:
     explicit QAccessibleAbstractSpinBox(QWidget *w);
 …
 class QAccessibleAbstractSlider: public QAccessibleWidgetEx, public QAccessibleValueInterface
+{
 public:
     explicit QAccessibleAbstractSlider(QWidget *w, Role r = Slider);

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/simplewidgets.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
+}
 #ifndef QT_NO_TOOLBUTTON
 /*!
 …
             } else if (qobject_cast<QLCDNumber*>(object())) {
                 QLCDNumber *l = qobject_cast<QLCDNumber*>(object());
                 if (l->numDigits())
+                if (l->())
                     str = QString::number(l->value());
                 else
 …
+}
 #ifndef QT_NO_LINEEDIT
 /*!
 …
 #endif // QT_NO_LINEEDIT
 #endif // QT_NO_ACCESSIBILITY

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/simplewidgets.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #define SIMPLEWIDGETS_H
 #include <QtGui/qaccessible2.h>
 #include <QtGui/qaccessiblewidget.h>
 …
 class QLineEdit;
 class QToolButton;
 class QAccessibleButton : public QAccessibleWidgetEx
+class QAccessibleButton : public QAccessibleWidgetEx
+{
 public:
     QAccessibleButton(QWidget *w, Role r);
 …
     QString actionText(int action, Text text, int child) const;
     bool doAction(int action, int child, const QVariantList &params);
 protected:
 …
 #endif // QT_NO_TOOLBUTTON
 class QAccessibleDisplay : public QAccessibleWidgetEx
+class QAccessibleDisplay : public QAccessibleWidgetEx
+{
 public:
     explicit QAccessibleDisplay(QWidget *w, Role role = StaticText);
 …
     Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const;
     int navigate(RelationFlag, int entry, QAccessibleInterface **target) const;
 };
 …
                             public QAccessibleSimpleEditableTextInterface
+{
 public:
     explicit QAccessibleLineEdit(QWidget *o, const QString &name = QString());
 …
 #endif // QT_NO_LINEEDIT
 #endif // QT_NO_ACCESSIBILITY

branches/vendor/nokia/qt/current/src/plugins/codecs/cn/cn.pro

r2	r556
13	13	target.path += $$[QT_INSTALL_PLUGINS]/codecs
14	14	INSTALLS += target
	15
	16

branches/vendor/nokia/qt/current/src/plugins/codecs/cn/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/cn/qgb18030codec.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/cn/qgb18030codec.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/jp.pro

r2	r556
24	24	target.path += $$[QT_INSTALL_PLUGINS]/codecs
25	25	INSTALLS += target
	26
	27

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qeucjpcodec.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
 // and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the  team.
 /*! \class QEucJpCodec
 …
 #ifndef QT_NO_TEXTCODEC
-static const uchar Esc = 0x1b;
 static const uchar Ss2 = 0x8e;        // Single Shift 2
 static const uchar Ss3 = 0x8f;        // Single Shift 3

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qeucjpcodec.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
 // and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the  team.
 /*

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qfontjpcodec.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qfontjpcodec.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qjiscodec.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 // Most of the code here was originally written by Serika Kurusugawa,
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission
 // and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the  team.
 /*! \class QJisCodec

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qjiscodec.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
 // and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the  team.
 /*

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qjpunicode.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qjpunicode.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
 // and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the  team.
 /*

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qsjiscodec.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
 // and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the  team.
 /*! \class QSjisCodec

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qsjiscodec.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 // Most of the code here was originally written by Serika Kurusugawa
 // a.k.a. Junji Takagi, and is included in Qt with the author's permission,
 // and the grateful thanks of the Trolltech team.
+// and the grateful thanks of the  team.
 /*

branches/vendor/nokia/qt/current/src/plugins/codecs/kr/cp949codetbl.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/kr/kr.pro

r2	r556
17	17	target.path += $$[QT_INSTALL_PLUGINS]/codecs
18	18	INSTALLS += target
	19
	20

branches/vendor/nokia/qt/current/src/plugins/codecs/kr/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/kr/qeuckrcodec.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 // Most of the cp949 code was originally written by Joon-Kyu Park, and is included
 // in Qt with the author's permission and the grateful thanks of the Trolltech team.
+// in Qt with the author's permission and the grateful thanks of the  team.
 /*! \class QEucKrCodec

branches/vendor/nokia/qt/current/src/plugins/codecs/kr/qeuckrcodec.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/tw/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/tw/qbig5codec.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/codecs/tw/qbig5codec.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 // Most of the code here was originally written by Ming-Che Chuang and
 // is included in Qt with the author's permission, and the grateful
 // thanks of the Trolltech team.
+// thanks of the  team.
 #ifndef QBIG5CODEC_H

branches/vendor/nokia/qt/current/src/plugins/codecs/tw/tw.pro

r2	r556
13	13	target.path += $$[QT_INSTALL_PLUGINS]/codecs
14	14	INSTALLS += target
	15
	16

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/graphicssystems.pro

-              r2
+              r556
 TEMPLATE = subdirs
+contains(QT_CONFIG, opengl):SUBDIRS += opengl
+SUBDIRS += trace
+!wince*:contains(QT_CONFIG, opengl):SUBDIRS += opengl
+contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl):SUBDIRS += openvg
+contains(QT_CONFIG, shivavg) {
+    # Only works under X11 at present
+    !win32:!embedded:!mac:SUBDIRS += shivavg
+}

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/opengl/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <private/qgraphicssystemplugin_p.h>
 #include <private/qgraphicssystem_gl_p.h>
 QT_BEGIN_NAMESPACE
 …
 QStringList QGLGraphicsSystemPlugin::keys() const
+{
+    return QStringList(QLatin1String("OpenGL"));
+    QStringList list;
+    list << QLatin1String("OpenGL") << QLatin1String("OpenGL1");
+#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
+    list << QLatin1String("OpenGL2");
+#endif
+    return list;
+}
 QGraphicsSystem* QGLGraphicsSystemPlugin::create(const QString& system)
+{
     if (system.toLower() == QLatin1String("opengl"))
         return new QGLGraphicsSystem;

branches/vendor/nokia/qt/current/src/plugins/iconengines/svgiconengine/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     void stepSerialNum()
         { serialNum = lastSerialNum.fetchAndAddRelaxed(1); };
+        { serialNum = lastSerialNum.fetchAndAddRelaxed(1); }
     void loadDataForModeAndState(QSvgRenderer *renderer, QIcon::Mode mode, QIcon::State state);
 …
             return size;
+    }
+    QSvgRenderer renderer;
+    d->loadDataForModeAndState(&renderer, mode, state);
+    if (renderer.isValid()) {
+        QSize defaultSize = renderer.defaultSize();
+        if (!defaultSize.isNull())
+            defaultSize.scale(size, Qt::KeepAspectRatio);
+        return defaultSize;
+    } else {
+    QPixmap pm = pixmap(size, mode, state);
+    if (pm.isNull())
         return QSize();
+    }
+}
 …
 QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
                                QIcon::State state)
+{
+{
     QPixmap pm;
     if (d->addedPixmaps) {
 …
     if (!actualSize.isNull())
         actualSize.scale(size, Qt::KeepAspectRatio);
-    QString pmckey(d->pmcKey(actualSize, mode, state));
-    if (QPixmapCache::find(pmckey, pm))
-        return pm;
     QImage img(actualSize, QImage::Format_ARGB32_Premultiplied);

branches/vendor/nokia/qt/current/src/plugins/iconengines/svgiconengine/qsvgiconengine.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/iconengines/svgiconengine/svgiconengine.pro

r2	r556
10	10	target.path += $$[QT_INSTALL_PLUGINS]/iconengines
11	11	INSTALLS += target
	12
	13

branches/vendor/nokia/qt/current/src/plugins/imageformats/gif/gif.pro

r2	r556
9	9	target.path += $$[QT_INSTALL_PLUGINS]/imageformats
10	10	INSTALLS += target
	11
	12

branches/vendor/nokia/qt/current/src/plugins/imageformats/gif/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/gif/qgifhandler.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #define Q_TRANSPARENT 0x00ffffff
 /*
 …
     bool out_of_bounds;
     bool digress;
     void nextY(QImage *image);
+    void nextY();
     void disposePrevious(QImage *image);
 };
 …
     //    CompuServe Incorporated."
 #define LM(l, m) (((m)<<8)|l)
     digress = false;
     int initial = length;
+    int initial = length;
     while (!digress && length) {
         length--;
 …
                 QImage::Format format = trans_index >= 0 ? QImage::Format_ARGB32 : QImage::Format_RGB32;
                 if (image->isNull() || (image->size() != QSize(swidth, sheight)) || image->format() != format) {
+                if (image->isNull()) {
                     (*image) = QImage(swidth, sheight, format);
+                    memset(image->bits(), 0, image->numBytes());
+                    bpl = image->bytesPerLine();
+                    bits = image->bits();
+                    memset(bits, 0, image->byteCount());
                     // ### size of the upcoming frame, should rather
 …
                                               qMax(backingstore.height(), h),
                                               QImage::Format_RGB32);
                         memset(image->bits(), 0, image->numBytes());
+                        memset(());
+                    }
                     for (int ln=0; ln<h; ln++) {
                         memcpy(backingstore.scanLine(ln),
                                image->scanLine(t+ln)+l, w*sizeof(QRgb));
+                        memcpy(ln),
+                               l, w*sizeof(QRgb));
+                    }
+                }
 …
                         firstcode=oldcode=code;
                         if (!out_of_bounds && image->height() > y && firstcode!=trans_index)
                             ((QRgb*)image->scanLine(y))[x] = color(firstcode);
+                            ((QRgb*)y))[x] = color(firstcode);
                         x++;
                         if (x>=swidth) out_of_bounds = true;
 …
                             x=left;
                             out_of_bounds = left>=swidth || y>=sheight;
                             nextY(image);
+                            nextY();
+                        }
                     } else {
 …
                         QRgb *line = 0;
                         if (!out_of_bounds && h > y)
                             line = (QRgb*)image->scanLine(y);
+                            line = (QRgb*)y);
                         while (sp>stack) {
                             const uchar index = *(--sp);
 …
                                 x=left;
                                 out_of_bounds = left>=swidth || y>=sheight;
                                 nextY(image);
+                                nextY();
                                 if (!out_of_bounds && h > y)
                                     line = (QRgb*)image->scanLine(y);
+                                    line = (QRgb*)y);
+                            }
+                        }
 …
+}
 void QGIFFormat::nextY(QImage *image)
+void QGIFFormat::nextY()
+{
     int my;
 …
         if (trans_index < 0) {
             for (i=1; i<=my; i++) {
                 memcpy(image->scanLine(y+i)+left*sizeof(QRgb), image->scanLine(y)+left*sizeof(QRgb),
+                memcpy(y)+left*sizeof(QRgb),
                        (right-left+1)*sizeof(QRgb));
+            }
 …
         if (trans_index < 0) {
             for (i=1; i<=my; i++) {
                 memcpy(image->scanLine(y+i)+left*sizeof(QRgb), image->scanLine(y)+left*sizeof(QRgb),
+                memcpy(y)+left*sizeof(QRgb),
                        (right-left+1)*sizeof(QRgb));
+            }
 …
         if (trans_index < 0) {
             for (i=1; i<=my; i++) {
                 memcpy(image->scanLine(y+i)+left*sizeof(QRgb), image->scanLine(y)+left*sizeof(QRgb),
+                memcpy(y)+left*sizeof(QRgb),
                        (right-left+1)*sizeof(QRgb));
+            }

branches/vendor/nokia/qt/current/src/plugins/imageformats/gif/qgifhandler.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/ico/ico.pro

r2	r556
11	11	target.path += $$[QT_INSTALL_PLUGINS]/imageformats
12	12	INSTALLS += target
	13
	14

branches/vendor/nokia/qt/current/src/plugins/imageformats/ico/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/ico/qicohandler.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 typedef struct
+{
     quint8      bWidth;               // Width of the image
     quint8      bHeight;              // Height of the image (times 2)
     quint8      bColorCount;          // Number of colors in image (0 if >=8bpp) [ not ture ]
     quint8      bReserved;            // Reserved
     quint16     wPlanes;              // Color Planes
     quint16     wBitCount;            // Bits per pixel
     quint32     dwBytesInRes;         // how many bytes in this resource?
     quint32     dwImageOffset;        // where in the file is this image
+    quint8bWidth;               // Width of the image
+    quint8bHeight;              // Height of the image (times 2)
+    quint8bColorCount;          // Number of colors in image (0 if >=8bpp) [ not ture ]
+    quint8bReserved;            // Reserved
+    quint16wPlanes;              // Color Planes
+    quint16wBitCount;            // Bits per pixel
+    quint32dwBytesInRes;         // how many bytes in this resource?
+    quint32dwImageOffset;        // where in the file is this image
 } ICONDIRENTRY, *LPICONDIRENTRY;
 #define ICONDIRENTRY_SIZE 16
 …
 typedef struct
+{
     quint16     idReserved;   // Reserved
     quint16     idType;       // resource type (1 for icons)
     quint16     idCount;      // how many images?
     ICONDIRENTRY        idEntries[1]; // the entries for each image
+    quint16idReserved;   // Reserved
+    quint16idType;       // resource type (1 for icons)
+    quint16idCount;      // how many images?
+    ICONDIRENTRYidEntries[1]; // the entries for each image
 } ICONDIR, *LPICONDIR;
 #define ICONDIR_SIZE    6       // Exclude the idEntries field
 typedef struct {                                // BMP information header
     quint32  biSize;                            // size of this struct
     quint32  biWidth;                           // pixmap width
     quint32  biHeight;                          // pixmap height
     quint16  biPlanes;                          // should be 1
     quint16  biBitCount;                        // number of bits per pixel
     quint32  biCompression;                     // compression method
     quint32  biSizeImage;                               // size of image
     quint32  biXPelsPerMeter;                   // horizontal resolution
     quint32  biYPelsPerMeter;           // vertical resolution
     quint32  biClrUsed;                         // number of colors used
     quint32  biClrImportant;                    // number of important colors
+typedef struct {// BMP information header
+    quint32 // size of this struct
+    quint32 // pixmap width
+    quint32
+    quint16 // should be 1
+    quint16 // number of bits per pixel
+    quint32 // compression method
+    quint32 // size of image
+    quint32 // horizontal resolution
+    quint32 // vertical resolution
+    quint32 // number of colors used
+    quint32 // number of important colors
 } BMP_INFOHDR ,*LPBMP_INFOHDR;
 #define BMP_INFOHDR_SIZE 40
 …
     bool readIconEntry(int index, ICONDIRENTRY * iconEntry);
     bool readBMPHeader(ICONDIRENTRY & iconEntry, BMP_INFOHDR * header);
+    bool readBMPHeader(, BMP_INFOHDR * header);
     void findColorInfo(QImage & image);
     void readColorTable(QImage & image);
 …
+{
     if (readHeader())
         return iconDir.idCount;
+return iconDir.idCount;
     return 0;
+}
 …
             qint64 readBytes = ICONDIR_SIZE;
             if (readIconDirEntry(iodev, &ikonDir.idEntries[0])) {
                 readBytes += ICONDIRENTRY_SIZE;
                 // ICO format does not have a magic identifier, so we read 6 different values, which will hopefully be enough to identify the file.
                 if (   ikonDir.idReserved == 0
                     && ikonDir.idType == 1
                     && ikonDir.idEntries[0].bReserved == 0
                     && ikonDir.idEntries[0].wPlanes <= 1
                     && ikonDir.idEntries[0].wBitCount <= 32     // Bits per pixel
                     && ikonDir.idEntries[0].dwBytesInRes >= 40  // Must be over 40, since sizeof (infoheader) == 40
                     ) {
                     isProbablyICO = true;
+                }
+        readBytes += ICONDIRENTRY_SIZE;
+        // ICO format does not have a magic identifier, so we read 6 different values, which will hopefully be enough to identify the file.
+        if (   ikonDir.idReserved == 0
+            && ikonDir.idType == 1
+            && ikonDir.idEntries[0].bReserved == 0
+            && ikonDir.idEntries[0].wPlanes <= 1
+            && ikonDir.idEntries[0].wBitCount <= 32     // Bits per pixel
+            && ikonDir.idEntries[0].dwBytesInRes >= 40  // Must be over 40, since sizeof (infoheader) == 40
+            ) {
+            isProbablyICO = true;
+        }
                 if (iodev->isSequential()) {
 …
                 iodev->ungetChar(tmp & 0xff);
+            }
+        }
+        }
         if (!iodev->isSequential()) iodev->seek(oldPos);
+    }
 …
+{
     if (iod && !headerRead) {
         startpos = iod->pos();
         if (readIconDir(iod, &iconDir)) {
             if (iconDir.idReserved == 0 || iconDir.idType == 1)
                 headerRead = true;
+        }
+startpos = iod->pos();
+if (readIconDir(iod, &iconDir)) {
+    if (iconDir.idReserved == 0 || iconDir.idType == 1)
+headerRead = true;
+}
+    }
 …
+}
 bool ICOReader::readIconEntry(int index, ICONDIRENTRY * iconEntry)
+bool ICOReader::readIconEntry(int index, ICONDIRENTRY *iconEntry)
+{
     if (iod) {
         if (iod->seek(startpos + ICONDIR_SIZE + (index * ICONDIRENTRY_SIZE))) {
             return readIconDirEntry(iod, iconEntry);
+if (iod->seek(startpos + ICONDIR_SIZE + (index * ICONDIRENTRY_SIZE))) {
+    return readIconDirEntry(iod, iconEntry);
+        }
+    }
 …
+bool ICOReader::readBMPHeader(ICONDIRENTRY & iconEntry, BMP_INFOHDR * header)
+{
+    memset(&icoAttrib, 0, sizeof(IcoAttrib));
+bool ICOReader::readBMPHeader(quint32 imageOffset, BMP_INFOHDR * header)
+{
     if (iod) {
+        if (iod->seek(startpos + iconEntry.dwImageOffset)) {
+            if (readBMPInfoHeader(iod, header)) {
+                icoAttrib.nbits = header->biBitCount ? header->biBitCount : iconEntry.wBitCount;
+                icoAttrib.h = header->biHeight / 2; // this height is always double the iconEntry height (for the mask)
+                icoAttrib.w = header->biWidth;
+                switch (icoAttrib.nbits) {
+                case 32:
+                case 24:
+                case 16:
+                    icoAttrib.depth = 32;
+                    break;
+                case 8:
+                case 4:
+                    icoAttrib.depth = 8;
+                    break;
+                default:
+                    icoAttrib.depth = 1;
+                }
+                if ( icoAttrib.depth == 32 )                            // there's no colormap
+                    icoAttrib.ncolors = 0;
+                else                                    // # colors used
+                    icoAttrib.ncolors = header->biClrUsed ? header->biClrUsed : 1 << icoAttrib.nbits;
+                //qDebug() << "Bits:" << icoAttrib.nbits << "Depth:" << icoAttrib.depth << "Ncols:" << icoAttrib.ncolors;
+                return TRUE;
+            }
+        }
+        if (iod->seek(startpos + imageOffset)) {
+            if (readBMPInfoHeader(iod, header)) {
+                return TRUE;
+            }
+        }
+    }
     return FALSE;
 …
 void ICOReader::findColorInfo(QImage & image)
+{
     if (icoAttrib.ncolors > 0) {                                // set color table
         readColorTable(image);
+    if (icoAttrib.ncolors > 0) {// set color table
+readColorTable(image);
     } else if (icoAttrib.nbits == 16) { // don't support RGB values for 15/16 bpp
         image = QImage();
+image = QImage();
+    }
+}
 …
+{
     if (iod) {
         image.setNumColors(icoAttrib.ncolors);
         uchar rgb[4];
         for (int i=0; i<icoAttrib.ncolors; i++) {
             if (iod->read((char*)rgb, 4) != 4) {
                 image = QImage();
                 break;
+            }
             image.setColor(i, qRgb(rgb[2],rgb[1],rgb[0]));
+        }
+        image.set(icoAttrib.ncolors);
+uchar rgb[4];
+for (int i=0; i<icoAttrib.ncolors; i++) {
+    if (iod->read((char*)rgb, 4) != 4) {
+image = QImage();
+break;
+    }
+    image.setColor(i, qRgb(rgb[2],rgb[1],rgb[0]));
+}
     } else {
         image = QImage();
+image = QImage();
+    }
+}
 …
 void ICOReader::readBMP(QImage & image)
+{
     if (icoAttrib.nbits == 1) {                         // 1 bit BMP image
         read1BitBMP(image);
     } else if (icoAttrib.nbits == 4) {                  // 4 bit BMP image
         read4BitBMP(image);
+    if (icoAttrib.nbits == 1) {// 1 bit BMP image
+read1BitBMP(image);
+    } else if (icoAttrib.nbits == 4) {// 4 bit BMP image
+read4BitBMP(image);
     } else if (icoAttrib.nbits == 8) {
         read8BitBMP(image);
+read8BitBMP(image);
     } else if (icoAttrib.nbits == 16 || icoAttrib.nbits == 24 || icoAttrib.nbits == 32 ) { // 16,24,32 bit BMP image
         read16_24_32BMP(image);
+read16_24_32BMP(image);
+    }
+}
 …
     if (iod) {
         int h = image.height();
         int bpl = image.bytesPerLine();
         while (--h >= 0) {
             if (iod->read((char*)image.scanLine(h),bpl) != bpl) {
                 image = QImage();
                 break;
+            }
+        }
+int h = image.height();
+int bpl = image.bytesPerLine();
+while (--h >= 0) {
+    if (iod->read((char*)image.scanLine(h),bpl) != bpl) {
+image = QImage();
+break;
+    }
+}
     } else {
         image = QImage();
+image = QImage();
+    }
+}
 …
     if (iod) {
         int h = icoAttrib.h;
         int buflen = ((icoAttrib.w+7)/8)*4;
         uchar *buf = new uchar[buflen];
         Q_CHECK_PTR(buf);
         while (--h >= 0) {
             if (iod->read((char*)buf,buflen) != buflen) {
                 image = QImage();
                 break;
+            }
             register uchar *p = image.scanLine(h);
             uchar *b = buf;
             for (int i=0; i<icoAttrib.w/2; i++) {       // convert nibbles to bytes
                 *p++ = *b >> 4;
                 *p++ = *b++ & 0x0f;
+            }
             if (icoAttrib.w & 1)                        // the last nibble
                 *p = *b >> 4;
+        }
         delete [] buf;
+int h = icoAttrib.h;
+int buflen = ((icoAttrib.w+7)/8)*4;
+uchar *buf = new uchar[buflen];
+Q_CHECK_PTR(buf);
+while (--h >= 0) {
+    if (iod->read((char*)buf,buflen) != buflen) {
+image = QImage();
+break;
+    }
+    register uchar *p = image.scanLine(h);
+    uchar *b = buf;
+// convert nibbles to bytes
+*p++ = *b >> 4;
+*p++ = *b++ & 0x0f;
+    }
+// the last nibble
+*p = *b >> 4;
+}
+delete [] buf;
     } else {
         image = QImage();
+image = QImage();
+    }
+}
 …
     if (iod) {
         int h = icoAttrib.h;
         int bpl = image.bytesPerLine();
         while (--h >= 0) {
             if (iod->read((char *)image.scanLine(h), bpl) != bpl) {
                 image = QImage();
                 break;
+            }
+        }
+int h = icoAttrib.h;
+int bpl = image.bytesPerLine();
+while (--h >= 0) {
+    if (iod->read((char *)image.scanLine(h), bpl) != bpl) {
+image = QImage();
+break;
+    }
+}
     } else {
         image = QImage();
+image = QImage();
+    }
+}
 …
+{
     if (iod) {
+        int h = icoAttrib.h;
+        register QRgb *p;
+        QRgb  *end;
+        uchar *buf = new uchar[image.bytesPerLine()];
+        int    bpl = ((icoAttrib.w*icoAttrib.nbits+31)/32)*4;
+        uchar *b;
+        while (--h >= 0) {
+            p = (QRgb *)image.scanLine(h);
+            end = p + icoAttrib.w;
+            if (iod->read((char *)buf, bpl) != bpl) {
+                image = QImage();
+                break;
+            }
+            b = buf;
+            while (p < end) {
+        int h = icoAttrib.h;
+        register QRgb *p;
+        QRgb  *end;
+        uchar *buf = new uchar[image.bytesPerLine()];
+        int    bpl = ((icoAttrib.w*icoAttrib.nbits+31)/32)*4;
+        uchar *b;
+        while (--h >= 0) {
+            p = (QRgb *)image.scanLine(h);
+            end = p + icoAttrib.w;
+            if (iod->read((char *)buf, bpl) != bpl) {
+                image = QImage();
+                break;
+            }
+            b = buf;
+            while (p < end) {
                 if (icoAttrib.nbits == 24)
                     *p++ = qRgb(*(b+2), *(b+1), *b);
                 else if (icoAttrib.nbits == 32)
                     *p++ = qRgba(*(b+2), *(b+1), *b, *(b+3));
                 b += icoAttrib.nbits/8;
+            }
+        }
         delete[] buf;
+b += icoAttrib.nbits/8;
+    }
+}
+delete[] buf;
     } else {
         image = QImage();
+image = QImage();
+    }
+}
 …
         if (readIconEntry(index, &iconEntry)) {
             BMP_INFOHDR header;
+            if (readBMPHeader(iconEntry, &header)) {
+            if (readBMPHeader(iconEntry.dwImageOffset, &header)) {
+                icoAttrib.nbits = header.biBitCount ? header.biBitCount : iconEntry.wBitCount;
+                switch (icoAttrib.nbits) {
+                case 32:
+                case 24:
+                case 16:
+                    icoAttrib.depth = 32;
+                    break;
+                case 8:
+                case 4:
+                    icoAttrib.depth = 8;
+                    break;
+                default:
+                    icoAttrib.depth = 1;
+                }
+                if (icoAttrib.depth == 32)                // there's no colormap
+                    icoAttrib.ncolors = 0;
+                else                    // # colors used
+                    icoAttrib.ncolors = header.biClrUsed ? header.biClrUsed : 1 << icoAttrib.nbits;
+                icoAttrib.w = iconEntry.bWidth;
+                icoAttrib.h = iconEntry.bHeight;
                 QImage::Format format = QImage::Format_ARGB32;
 …
                             QImage mask(image.width(), image.height(), QImage::Format_Mono);
                             if (!mask.isNull()) {
                                 mask.setNumColors(2);
+                                mask.set(2);
                                 mask.setColor(0, qRgba(255,255,255,0xff));
                                 mask.setColor(1, qRgba(0  ,0  ,0  ,0xff));
 …
     ICOReader reader(device);
     for (int i=0; i<reader.count(); i++)
         images += reader.iconAt(i);
+    for (int ireader.count(); i++)
+images += reader.iconAt(i);
     return images;
 …
             maskImage = maskImage.convertToFormat(QImage::Format_Mono);
             int nbits = 32;
             int bpl_bmp = ((image.width()*nbits+31)/32)*4;
+            intnbits = 32;
+            intbpl_bmp = ((image.width()*nbits+31)/32)*4;
             entries[i].bColorCount = 0;
 …
                 + (maskImage.bytesPerLine() * maskImage.height());
             entries[i].wPlanes = 1;
             if (i==0)
+            if (i0)
                 entries[i].dwImageOffset = origOffset + ICONDIR_SIZE
                 + (id.idCount * ICONDIRENTRY_SIZE);
 …
             memset( buf, 0, bpl_bmp );
             int y;
             for (y=image.height()-1; y>=0; y--) {       // write the image bits
+            for (y// write the image bits
                 // 32 bits
                 QRgb *p   = (QRgb *)image.scanLine(y);
 …
             maskImage.invertPixels();   // seems as though it needs this
             // NOTE! !! The mask is only flipped vertically - not horizontally !!
             for (y=maskImage.height()-1; y>=0; y--)
+            for (y0; y--)
                 buffer.write((char*)maskImage.scanLine(y), maskImage.bytesPerLine());
+        }
+        }
         if (writeIconDir(device, id)) {
 …
+            }
             if (bOK) {
                 for (i=0; i<id.idCount && bOK; i++) {
+                for (iid.idCount && bOK; i++) {
                     bOK = writeBMPInfoHeader(device, bmpHeaders[i]);
                     bOK &= (device->write(imageData[i]) == (int) imageData[i].size());

branches/vendor/nokia/qt/current/src/plugins/imageformats/ico/qicohandler.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/jpeg/jpeg.pro

-              r2
+              r556
         contains(CE_ARCH,x86):CONFIG -= stl exceptions
         contains(CE_ARCH,x86):CONFIG += exceptions_off
+}
 …
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target

branches/vendor/nokia/qt/current/src/plugins/imageformats/jpeg/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/jpeg/qjpeghandler.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QImageSmoothScaler(const int w, const int h, const QImage &src);
     QImageSmoothScaler(const int srcWidth, const int srcHeight,
                        const char *parameters);
+                       const );
     virtual ~QImageSmoothScaler(void);
     QImage  scale();
-protected:
-    int scaledWidth(void) const;
 private:
 …
 QImageSmoothScaler::QImageSmoothScaler(const int srcWidth, const int srcHeight,
+                                       const char *parameters)
+{
+    char    sModeStr[1024];
+    int     t1;
+    int     t2;
+    int     dstWidth;
+    int     dstHeight;
+    sModeStr[0] = '\0';
+                                       const int dstWidth, const int dstHeight)
+{
     d = new QImageSmoothScalerPrivate;
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && defined(_MSC_VER) && _MSC_VER >= 1400
-    sscanf_s(parameters, "Scale( %i, %i, %1023s )", &dstWidth, &dstHeight, sModeStr, sizeof(sModeStr));
-#else
-    sscanf(parameters, "Scale( %i, %i, %s )", &dstWidth, &dstHeight, sModeStr);
-#endif
-    QString sModeQStr = QString::fromLatin1(sModeStr);
-    t1 = srcWidth * dstHeight;
-    t2 = srcHeight * dstWidth;
-    if (((sModeQStr == QLatin1String("ScaleMin")) && (t1 > t2)) || ((sModeQStr == QLatin1String("ScaleMax")) && (t2 < t2))) {
-        dstHeight = t2 / srcWidth;
-    } else if (sModeQStr != QLatin1String("ScaleFree")) {
-        dstWidth = t1 / srcHeight;
+    }
     d->setup(srcWidth, srcHeight, dstWidth, dstHeight, 0);
+}
 …
     newrows = dstHeight;
     hasAlpha = hasAlphaChannel;
+}
-int QImageSmoothScaler::scaledWidth() const
+{
-    return d->cols;
+}
 …
 QImage QImageSmoothScaler::scale()
+{
     long    SCALE;
     long    HALFSCALE;
     QRgb    *xelrow = 0;
     QRgb    *tempxelrow = 0;
     QRgb    *xP;
     QRgb    *nxP;
     int     row, rowsread;
     int     col, needtoreadrow;
     uchar   maxval = 255;
     qreal  xscale, yscale;
     long    sxscale, syscale;
     long    fracrowtofill, fracrowleft;
     long    *as;
     long    *rs;
     long    *gs;
     long    *bs;
     int     rowswritten = 0;
     QImage  dst;
+    long SCALE;
+    long HALFSCALE;
+    QRgb *xelrow = 0;
+    QRgb *tempxelrow = 0;
+    QRgb *xP;
+    QRgb *nxP;
+    int row, rowsread;
+    int col, needtoreadrow;
+    uchar maxval = 255;
+    qreal xscale, yscale;
+    long sxscale, syscale;
+    long fracrowtofill, fracrowleft;
+    long *as;
+    long *rs;
+    long *gs;
+    long *bs;
+    int rowswritten = 0;
+    QImage dst;
     if (d->cols > 4096) {
         SCALE = 4096;
         HALFSCALE = 2048;
+SCALE = 4096;
+HALFSCALE = 2048;
     } else {
+        int fac = 4096;
+        while (d->cols * fac > 4096) {
+            fac /= 2;
+        }
+        SCALE = fac * d->cols;
+        HALFSCALE = fac * d->cols / 2;
+    }
+    xscale = (qreal) d->newcols / (qreal) d->cols;
+    yscale = (qreal) d->newrows / (qreal) d->rows;
+        int fac = 4096;
+        while (d->cols * fac > 4096)
+            fac /= 2;
+        SCALE = fac * d->cols;
+        HALFSCALE = fac * d->cols / 2;
+    }
+    xscale = (qreal)d->newcols / (qreal)d->cols;
+    yscale = (qreal)d->newrows / (qreal)d->rows;
     sxscale = (long)(xscale * SCALE);
     syscale = (long)(yscale * SCALE);
+    if ( d->newrows != d->rows )        /* shortcut Y scaling if possible */
+        tempxelrow = new QRgb[d->cols];
+    if ( d->hasAlpha ) {
+        as = new long[d->cols];
+        for ( col = 0; col < d->cols; ++col )
+            as[col] = HALFSCALE;
+    // shortcut Y scaling if possible
+    if (d->newrows != d->rows)
+        tempxelrow = new QRgb[d->cols];
+    if (d->hasAlpha) {
+        as = new long[d->cols];
+        for (col = 0; col < d->cols; ++col)
+            as[col] = HALFSCALE;
     } else {
         as = 0;
+as = 0;
+    }
     rs = new long[d->cols];
 …
     fracrowleft = syscale;
     needtoreadrow = 1;
     for ( col = 0; col < d->cols; ++col )
         rs[col] = gs[col] = bs[col] = HALFSCALE;
+    for ()
+rs[col] = gs[col] = bs[col] = HALFSCALE;
     fracrowtofill = SCALE;
+    dst = QImage( d->newcols, d->newrows, d->hasAlpha ? QImage::Format_ARGB32 : QImage::Format_RGB32 );
+    for ( row = 0; row < d->newrows; ++row ) {
+        /* First scale Y from xelrow into tempxelrow. */
+        if ( d->newrows == d->rows ) {
+            /* shortcut Y scaling if possible */
+            tempxelrow = xelrow = scanLine(rowsread++, d->src);
+        } else {
+            while ( fracrowleft < fracrowtofill ) {
+                if ( needtoreadrow && rowsread < d->rows ) {
+                    xelrow = scanLine(rowsread++, d->src);
+                }
+                for ( col = 0, xP = xelrow; col < d->cols; ++col, ++xP ) {
+                    if (as) {
+                        as[col] += fracrowleft * qAlpha( *xP );
+                        rs[col] += fracrowleft * qRed( *xP ) * qAlpha( *xP ) / 255;
+                        gs[col] += fracrowleft * qGreen( *xP ) * qAlpha( *xP ) / 255;
+                        bs[col] += fracrowleft * qBlue( *xP ) * qAlpha( *xP ) / 255;
+                    } else {
+                        rs[col] += fracrowleft * qRed( *xP );
+                        gs[col] += fracrowleft * qGreen( *xP );
+                        bs[col] += fracrowleft * qBlue( *xP );
+                    }
+                }
+                fracrowtofill -= fracrowleft;
+                fracrowleft = syscale;
+                needtoreadrow = 1;
+            }
+            /* Now fracrowleft is >= fracrowtofill, so we can produce a row. */
+            if ( needtoreadrow && rowsread < d->rows) {
+                xelrow = scanLine(rowsread++, d->src);
+                needtoreadrow = 0;
+            }
+            for ( col = 0, xP = xelrow, nxP = tempxelrow;
+                  col < d->cols; ++col, ++xP, ++nxP )
+            {
+                register long a, r, g, b;
+                if ( as ) {
+                    r = rs[col] + fracrowtofill * qRed( *xP ) * qAlpha( *xP ) / 255;
+                    g = gs[col] + fracrowtofill * qGreen( *xP ) * qAlpha( *xP ) / 255;
+                    b = bs[col] + fracrowtofill * qBlue( *xP ) * qAlpha( *xP ) / 255;
+                    a = as[col] + fracrowtofill * qAlpha( *xP );
+                    if ( a ) {
+                        r = r * 255 / a * SCALE;
+                        g = g * 255 / a * SCALE;
+                        b = b * 255 / a * SCALE;
+                    }
+                } else {
+                    r = rs[col] + fracrowtofill * qRed( *xP );
+                    g = gs[col] + fracrowtofill * qGreen( *xP );
+                    b = bs[col] + fracrowtofill * qBlue( *xP );
+                    a = 0; // unwarn
+                }
+                r /= SCALE;
+                if ( r > maxval ) r = maxval;
+                g /= SCALE;
+                if ( g > maxval ) g = maxval;
+                b /= SCALE;
+                if ( b > maxval ) b = maxval;
+                if ( as ) {
+                    a /= SCALE;
+                    if ( a > maxval ) a = maxval;
+                    *nxP = qRgba( (int)r, (int)g, (int)b, (int)a );
+                    as[col] = HALFSCALE;
+                } else {
+                    *nxP = qRgb( (int)r, (int)g, (int)b );
+                }
+                rs[col] = gs[col] = bs[col] = HALFSCALE;
+            }
+            fracrowleft -= fracrowtofill;
+            if ( fracrowleft == 0 ) {
+                fracrowleft = syscale;
+                needtoreadrow = 1;
+            }
+            fracrowtofill = SCALE;
+        }
+        /* Now scale X from tempxelrow into dst and write it out. */
+        if ( d->newcols == d->cols ) {
+            /* shortcut X scaling if possible */
+            memcpy(dst.scanLine(rowswritten++), tempxelrow, d->newcols*4);
+        } else {
+            register long a, r, g, b;
+            register long fraccoltofill, fraccolleft = 0;
+            register int needcol;
+            nxP = (QRgb*)dst.scanLine(rowswritten++);
+            fraccoltofill = SCALE;
+            a = r = g = b = HALFSCALE;
+            needcol = 0;
+            for ( col = 0, xP = tempxelrow; col < d->cols; ++col, ++xP ) {
+                fraccolleft = sxscale;
+                while ( fraccolleft >= fraccoltofill ) {
+                    if ( needcol ) {
+                        ++nxP;
+                        a = r = g = b = HALFSCALE;
+                    }
+                    if ( as ) {
+                        r += fraccoltofill * qRed( *xP ) * qAlpha( *xP ) / 255;
+                        g += fraccoltofill * qGreen( *xP ) * qAlpha( *xP ) / 255;
+                        b += fraccoltofill * qBlue( *xP ) * qAlpha( *xP ) / 255;
+                        a += fraccoltofill * qAlpha( *xP );
+                        if ( a ) {
+                            r = r * 255 / a * SCALE;
+                            g = g * 255 / a * SCALE;
+                            b = b * 255 / a * SCALE;
+                        }
+                    } else {
+                        r += fraccoltofill * qRed( *xP );
+                        g += fraccoltofill * qGreen( *xP );
+                        b += fraccoltofill * qBlue( *xP );
+                    }
+                    r /= SCALE;
+                    if ( r > maxval ) r = maxval;
+                    g /= SCALE;
+                    if ( g > maxval ) g = maxval;
+                    b /= SCALE;
+                    if ( b > maxval ) b = maxval;
+                    if (as) {
+                        a /= SCALE;
+                        if ( a > maxval ) a = maxval;
+                        *nxP = qRgba( (int)r, (int)g, (int)b, (int)a );
+                    } else {
+                        *nxP = qRgb( (int)r, (int)g, (int)b );
+                    }
+                    fraccolleft -= fraccoltofill;
+                    fraccoltofill = SCALE;
+                    needcol = 1;
+                }
+                if ( fraccolleft > 0 ) {
+                    if ( needcol ) {
+                        ++nxP;
+                        a = r = g = b = HALFSCALE;
+                        needcol = 0;
+                    }
+                    if (as) {
+                        a += fraccolleft * qAlpha( *xP );
+                        r += fraccolleft * qRed( *xP ) * qAlpha( *xP ) / 255;
+                        g += fraccolleft * qGreen( *xP ) * qAlpha( *xP ) / 255;
+                        b += fraccolleft * qBlue( *xP ) * qAlpha( *xP ) / 255;
+                    } else {
+                        r += fraccolleft * qRed( *xP );
+                        g += fraccolleft * qGreen( *xP );
+                        b += fraccolleft * qBlue( *xP );
+                    }
+                    fraccoltofill -= fraccolleft;
+                }
+            }
+            if ( fraccoltofill > 0 ) {
+                --xP;
+                if (as) {
+                    a += fraccolleft * qAlpha( *xP );
+                    r += fraccoltofill * qRed( *xP ) * qAlpha( *xP ) / 255;
+                    g += fraccoltofill * qGreen( *xP ) * qAlpha( *xP ) / 255;
+                    b += fraccoltofill * qBlue( *xP ) * qAlpha( *xP ) / 255;
+                    if ( a ) {
+                        r = r * 255 / a * SCALE;
+                        g = g * 255 / a * SCALE;
+                        b = b * 255 / a * SCALE;
+                    }
+                } else {
+                    r += fraccoltofill * qRed( *xP );
+                    g += fraccoltofill * qGreen( *xP );
+                    b += fraccoltofill * qBlue( *xP );
+                }
+            }
+            if ( ! needcol ) {
+                r /= SCALE;
+                if ( r > maxval ) r = maxval;
+                g /= SCALE;
+                if ( g > maxval ) g = maxval;
+                b /= SCALE;
+                if ( b > maxval ) b = maxval;
+                if (as) {
+                    a /= SCALE;
+                    if ( a > maxval ) a = maxval;
+                    *nxP = qRgba( (int)r, (int)g, (int)b, (int)a );
+                } else {
+                    *nxP = qRgb( (int)r, (int)g, (int)b );
+                }
+            }
+        }
+    }
+    if ( d->newrows != d->rows && tempxelrow )// Robust, tempxelrow might be 0 1 day
+        delete [] tempxelrow;
+    if ( as )                           // Avoid purify complaint
+        delete [] as;
+    if ( rs )                           // Robust, rs might be 0 one day
+        delete [] rs;
+    if ( gs )                           // Robust, gs might be 0 one day
+        delete [] gs;
+    if ( bs )                           // Robust, bs might be 0 one day
+        delete [] bs;
+    dst = QImage(d->newcols, d->newrows, d->hasAlpha ? QImage::Format_ARGB32 : QImage::Format_RGB32);
+    for (row = 0; row < d->newrows; ++row) {
+        // First scale Y from xelrow into tempxelrow.
+        if (d->newrows == d->rows) {
+            // shortcut Y scaling if possible
+            tempxelrow = xelrow = scanLine(rowsread++, d->src);
+        } else {
+            while (fracrowleft < fracrowtofill) {
+                if (needtoreadrow && rowsread < d->rows)
+                    xelrow = scanLine(rowsread++, d->src);
+                for (col = 0, xP = xelrow; col < d->cols; ++col, ++xP) {
+                    if (as) {
+                        as[col] += fracrowleft * qAlpha(*xP);
+                        rs[col] += fracrowleft * qRed(*xP) * qAlpha(*xP) / 255;
+                        gs[col] += fracrowleft * qGreen(*xP) * qAlpha(*xP) / 255;
+                        bs[col] += fracrowleft * qBlue(*xP) * qAlpha(*xP) / 255;
+                    } else {
+                        rs[col] += fracrowleft * qRed(*xP);
+                        gs[col] += fracrowleft * qGreen(*xP);
+                        bs[col] += fracrowleft * qBlue(*xP);
+                    }
+                }
+                fracrowtofill -= fracrowleft;
+                fracrowleft = syscale;
+                needtoreadrow = 1;
+            }
+            // Now fracrowleft is >= fracrowtofill, so we can produce a row.
+            if (needtoreadrow && rowsread < d->rows) {
+                xelrow = scanLine(rowsread++, d->src);
+                needtoreadrow = 0;
+            }
+            for (col = 0, xP = xelrow, nxP = tempxelrow; col < d->cols; ++col, ++xP, ++nxP) {
+                register long a, r, g, b;
+                if (as) {
+                    r = rs[col] + fracrowtofill * qRed(*xP) * qAlpha(*xP) / 255;
+                    g = gs[col] + fracrowtofill * qGreen(*xP) * qAlpha(*xP) / 255;
+                    b = bs[col] + fracrowtofill * qBlue(*xP) * qAlpha(*xP) / 255;
+                    a = as[col] + fracrowtofill * qAlpha(*xP);
+                    if (a) {
+                        r = r * 255 / a * SCALE;
+                        g = g * 255 / a * SCALE;
+                        b = b * 255 / a * SCALE;
+                    }
+                } else {
+                    r = rs[col] + fracrowtofill * qRed(*xP);
+                    g = gs[col] + fracrowtofill * qGreen(*xP);
+                    b = bs[col] + fracrowtofill * qBlue(*xP);
+                    a = 0; // unwarn
+                }
+                r /= SCALE;
+                if (r > maxval)
+                    r = maxval;
+                g /= SCALE;
+                if (g > maxval)
+                    g = maxval;
+                b /= SCALE;
+                if (b > maxval)
+                    b = maxval;
+                if (as) {
+                    a /= SCALE;
+                    if (a > maxval)
+                        a = maxval;
+                    *nxP = qRgba((int)r, (int)g, (int)b, (int)a);
+                    as[col] = HALFSCALE;
+                } else {
+                    *nxP = qRgb((int)r, (int)g, (int)b);
+                }
+                rs[col] = gs[col] = bs[col] = HALFSCALE;
+            }
+            fracrowleft -= fracrowtofill;
+            if (fracrowleft == 0) {
+                fracrowleft = syscale;
+                needtoreadrow = 1;
+            }
+            fracrowtofill = SCALE;
+        }
+        // Now scale X from tempxelrow into dst and write it out.
+        if (d->newcols == d->cols) {
+            // shortcut X scaling if possible
+            memcpy(dst.scanLine(rowswritten++), tempxelrow, d->newcols * 4);
+        } else {
+            register long a, r, g, b;
+            register long fraccoltofill, fraccolleft = 0;
+            register int needcol;
+            nxP = (QRgb *)dst.scanLine(rowswritten++);
+            QRgb *nxPEnd = nxP + d->newcols;
+            fraccoltofill = SCALE;
+            a = r = g = b = HALFSCALE;
+            needcol = 0;
+            for (col = 0, xP = tempxelrow; col < d->cols; ++col, ++xP) {
+                fraccolleft = sxscale;
+                while (fraccolleft >= fraccoltofill) {
+                    if (needcol) {
+                        ++nxP;
+                        a = r = g = b = HALFSCALE;
+                    }
+                    if (as) {
+                        r += fraccoltofill * qRed(*xP) * qAlpha(*xP) / 255;
+                        g += fraccoltofill * qGreen(*xP) * qAlpha(*xP) / 255;
+                        b += fraccoltofill * qBlue(*xP) * qAlpha(*xP) / 255;
+                        a += fraccoltofill * qAlpha(*xP);
+                        if (a) {
+                            r = r * 255 / a * SCALE;
+                            g = g * 255 / a * SCALE;
+                            b = b * 255 / a * SCALE;
+                        }
+                    } else {
+                        r += fraccoltofill * qRed(*xP);
+                        g += fraccoltofill * qGreen(*xP);
+                        b += fraccoltofill * qBlue(*xP);
+                    }
+                    r /= SCALE;
+                    if (r > maxval)
+                        r = maxval;
+                    g /= SCALE;
+                    if (g > maxval)
+                        g = maxval;
+                    b /= SCALE;
+                    if (b > maxval)
+                        b = maxval;
+                    if (as) {
+                        a /= SCALE;
+                        if (a > maxval)
+                            a = maxval;
+                        *nxP = qRgba((int)r, (int)g, (int)b, (int)a);
+                    } else {
+                        *nxP = qRgb((int)r, (int)g, (int)b);
+                    }
+                    fraccolleft -= fraccoltofill;
+                    fraccoltofill = SCALE;
+                    needcol = 1;
+                }
+                if (fraccolleft > 0) {
+                    if (needcol) {
+                        ++nxP;
+                        a = r = g = b = HALFSCALE;
+                        needcol = 0;
+                    }
+                    if (as) {
+                        a += fraccolleft * qAlpha(*xP);
+                        r += fraccolleft * qRed(*xP) * qAlpha(*xP) / 255;
+                        g += fraccolleft * qGreen(*xP) * qAlpha(*xP) / 255;
+                        b += fraccolleft * qBlue(*xP) * qAlpha(*xP) / 255;
+                    } else {
+                        r += fraccolleft * qRed(*xP);
+                        g += fraccolleft * qGreen(*xP);
+                        b += fraccolleft * qBlue(*xP);
+                    }
+                    fraccoltofill -= fraccolleft;
+                }
+            }
+            if (fraccoltofill > 0) {
+                --xP;
+                if (as) {
+                    a += fraccolleft * qAlpha(*xP);
+                    r += fraccoltofill * qRed(*xP) * qAlpha(*xP) / 255;
+                    g += fraccoltofill * qGreen(*xP) * qAlpha(*xP) / 255;
+                    b += fraccoltofill * qBlue(*xP) * qAlpha(*xP) / 255;
+                    if (a) {
+                        r = r * 255 / a * SCALE;
+                        g = g * 255 / a * SCALE;
+                        b = b * 255 / a * SCALE;
+                    }
+                } else {
+                    r += fraccoltofill * qRed(*xP);
+                    g += fraccoltofill * qGreen(*xP);
+                    b += fraccoltofill * qBlue(*xP);
+                }
+            }
+            if (nxP < nxPEnd) {
+                r /= SCALE;
+                if (r > maxval)
+                    r = maxval;
+                g /= SCALE;
+                if (g > maxval)
+                    g = maxval;
+                b /= SCALE;
+                if (b > maxval)
+                    b = maxval;
+                if (as) {
+                    a /= SCALE;
+                    if (a > maxval)
+                        a = maxval;
+                    *nxP = qRgba((int)r, (int)g, (int)b, (int)a);
+                } else {
+                    *nxP = qRgb((int)r, (int)g, (int)b);
+                }
+                while (++nxP != nxPEnd)
+                    nxP[0] = nxP[-1];
+            }
+        }
+    }
+    if (d->newrows != d->rows && tempxelrow)// Robust, tempxelrow might be 0 1 day
+        delete [] tempxelrow;
+    if (as)                             // Avoid purify complaint
+        delete [] as;
+    if (rs)                             // Robust, rs might be 0 one day
+        delete [] rs;
+    if (gs)                             // Robust, gs might be 0 one day
+        delete [] gs;
+    if (bs)                             // Robust, bs might be 0 one day
+        delete [] bs;
     return dst;
 …
+{
 public:
+    jpegSmoothScaler(struct jpeg_decompress_struct *info, const char *params):
+        QImageSmoothScaler(info->output_width, info->output_height, params)
+    jpegSmoothScaler(struct jpeg_decompress_struct *info, const QSize& dstSize, const QRect& clipRect)
+        : QImageSmoothScaler(clipRect.width(), clipRect.height(),
+                             dstSize.width(), dstSize.height())
+    {
+        cinfo = info;
+        cols24Bit = scaledWidth() * 3;
+        cacheHeight = 1;
+        imageCache = QImage( info->output_width, cacheHeight, QImage::Format_RGB32 );
+        cinfo = info;
+        clip = clipRect;
+        imageCache = QImage(info->output_width, 1, QImage::Format_RGB32);
+    }
 private:
     int     cols24Bit;
+    ;
     QImage  imageCache;
-    int     cacheHeight;
     struct jpeg_decompress_struct *cinfo;
 …
         uchar* data = imageCache.bits();
         jpeg_read_scanlines(cinfo, &data, 1);
+        out = (QRgb*)imageCache.scanLine(0);
+        if (cinfo->output_scanline == cinfo->output_height)
+            jpeg_finish_decompress(cinfo);
+        out = ((QRgb*)data) + clip.x();
         //
 …
         //
         if (cinfo->output_components == 1) {
+            in = (uchar*)out + scaledWidth();
+            for (uint i = scaledWidth(); i--; ) {
+            in = data + clip.right();
+            for (int i = clip.width(); i--; ) {
+                out[i] = qRgb(*in, *in, *in);
                 in--;
-                out[i] = qRgb(*in, *in, *in);
+            }
+        } else {
+            in = (uchar*)out + cols24Bit;
+            for (uint i = scaledWidth(); i--; ) {
+        } else if (cinfo->out_color_space == JCS_CMYK) {
+            in = data + clip.right() * 4;
+            for (int i = clip.width(); i--; ) {
+                int k = in[3];
+                out[i] = qRgb(k * in[0] / 255, k * in[1] / 255, k * in[2] / 255);
+                in -= 4;
+            }
+        } else {
+            in = data + clip.right() * 3;
+            for (int i = clip.width(); i--; ) {
+                out[i] = qRgb(in[0], in[1], in[2]);
                 in -= 3;
-                out[i] = qRgb(in[0], in[1], in[2]);
+            }
+        }
 …
+}
-static void scaleSize(int &reqW, int &reqH, int imgW, int imgH, Qt::AspectRatioMode mode)
+{
-    if (mode == Qt::IgnoreAspectRatio)
-        return;
-    int t1 = imgW * reqH;
-    int t2 = reqW * imgH;
-    if ((mode == Qt::KeepAspectRatio && (t1 > t2)) || (mode == Qt::KeepAspectRatioByExpanding && (t1 < t2)))
-        reqH = t2 / imgW;
-    else
-        reqW = t1 / imgH;
+}
 static bool read_jpeg_size(QIODevice *device, int &w, int &h)
 …
 static bool ensureValidImage(QImage *dest, struct jpeg_decompress_struct *info,
                              bool dummy = false)
+                             e)
+{
     QImage::Format format;
 …
+    }
-    const QSize size(info->output_width, info->output_height);
     if (dest->size() != size || dest->format() != format) {
+        static uchar dummyImage[1];
+        if (dummy) // Create QImage but don't read the pixels
+            *dest = QImage(dummyImage, size.width(), size.height(), format);
+        else
+            *dest = QImage(size, format);
+        *dest = QImage(size, format);
         if (format == QImage::Format_Indexed8) {
             dest->setNumColors(256);
+            dest->set(256);
             for (int i = 0; i < 256; i++)
                 dest->setColor(i, qRgb(i,i,i));
 …
 static bool read_jpeg_image(QIODevice *device, QImage *outImage,
+                            const QByteArray &parameters, QSize scaledSize,
+                            int inQuality )
+{
+#ifdef QT_NO_IMAGE_SMOOTHSCALE
+    Q_UNUSED( scaledSize );
+#endif
+                            QSize scaledSize, QRect scaledClipRect,
+                            QRect clipRect, int inQuality )
+{
     struct jpeg_decompress_struct cinfo;
 …
             quality = 75;
+        QString params = QString::fromLatin1(parameters);
+        params.simplified();
+        int sWidth = 0, sHeight = 0;
+        char sModeStr[1024] = "";
+        Qt::AspectRatioMode sMode;
+#ifndef QT_NO_IMAGE_SMOOTHSCALE
+        // If high quality not required, shrink image during decompression
+        if (scaledSize.isValid() && quality < HIGH_QUALITY_THRESHOLD && !params.contains(QLatin1String("GetHeaderInformation")) ) {
+            cinfo.scale_denom = qMin(cinfo.image_width / scaledSize.width(),
+                                     cinfo.image_width / scaledSize.height());
+        // If possible, merge the scaledClipRect into either scaledSize
+        // or clipRect to avoid doing a separate scaled clipping pass.
+        // Best results are achieved by clipping before scaling, not after.
+        if (!scaledClipRect.isEmpty()) {
+            if (scaledSize.isEmpty() && clipRect.isEmpty()) {
+                // No clipping or scaling before final clip.
+                clipRect = scaledClipRect;
+                scaledClipRect = QRect();
+            } else if (scaledSize.isEmpty()) {
+                // Clipping, but no scaling: combine the clip regions.
+                scaledClipRect.translate(clipRect.topLeft());
+                clipRect = scaledClipRect.intersected(clipRect);
+                scaledClipRect = QRect();
+            } else if (clipRect.isEmpty()) {
+                // No clipping, but scaling: if we can map back to an
+                // integer pixel boundary, then clip before scaling.
+                if ((cinfo.image_width % scaledSize.width()) == 0 &&
+                        (cinfo.image_height % scaledSize.height()) == 0) {
+                    int x = scaledClipRect.x() * cinfo.image_width /
+                            scaledSize.width();
+                    int y = scaledClipRect.y() * cinfo.image_height /
+                            scaledSize.height();
+                    int width = (scaledClipRect.right() + 1) *
+                                cinfo.image_width / scaledSize.width() - x;
+                    int height = (scaledClipRect.bottom() + 1) *
+                                 cinfo.image_height / scaledSize.height() - y;
+                    clipRect = QRect(x, y, width, height);
+                    scaledSize = scaledClipRect.size();
+                    scaledClipRect = QRect();
+                }
+            } else {
+                // Clipping and scaling: too difficult to figure out,
+                // and not a likely use case, so do it the long way.
+            }
+        }
+        // Determine the scale factor to pass to libjpeg for quick downscaling.
+        if (!scaledSize.isEmpty()) {
+            if (clipRect.isEmpty()) {
+                cinfo.scale_denom =
+                    qMin(cinfo.image_width / scaledSize.width(),
+                         cinfo.image_height / scaledSize.height());
+            } else {
+                cinfo.scale_denom =
+                    qMin(clipRect.width() / scaledSize.width(),
+                         clipRect.height() / scaledSize.height());
+            }
             if (cinfo.scale_denom < 2) {
                 cinfo.scale_denom = 1;
 …
+            }
             cinfo.scale_num = 1;
+        }
+#endif
+            if (!clipRect.isEmpty()) {
+                // Correct the scale factor so that we clip accurately.
+                // It is recommended that the clip rectangle be aligned
+                // on an 8-pixel boundary for best performance.
+                while (cinfo.scale_denom > 1 &&
+                       ((clipRect.x() % cinfo.scale_denom) != 0 ||
+                        (clipRect.y() % cinfo.scale_denom) != 0 ||
+                        (clipRect.width() % cinfo.scale_denom) != 0 ||
+                        (clipRect.height() % cinfo.scale_denom) != 0)) {
+                    cinfo.scale_denom /= 2;
+                }
+            }
+        }
         // If high quality not required, use fast decompression
 …
+        }
+        (void) jpeg_start_decompress(&cinfo);
+        if (params.contains(QLatin1String("GetHeaderInformation"))) {
+            if (!ensureValidImage(outImage, &cinfo, true))
+        (void) jpeg_calc_output_dimensions(&cinfo);
+        // Determine the clip region to extract.
+        QRect imageRect(0, 0, cinfo.output_width, cinfo.output_height);
+        QRect clip;
+        if (clipRect.isEmpty()) {
+            clip = imageRect;
+        } else if (cinfo.scale_denom == 1) {
+            clip = clipRect.intersected(imageRect);
+        } else {
+            // The scale factor was corrected above to ensure that
+            // we don't miss pixels when we scale the clip rectangle.
+            clip = QRect(clipRect.x() / int(cinfo.scale_denom),
+                         clipRect.y() / int(cinfo.scale_denom),
+                         clipRect.width() / int(cinfo.scale_denom),
+                         clipRect.height() / int(cinfo.scale_denom));
+            clip = clip.intersected(imageRect);
+        }
+#ifndef QT_NO_IMAGE_SMOOTHSCALE
+        if (scaledSize.isValid() && scaledSize != clip.size()
+            && quality >= HIGH_QUALITY_THRESHOLD) {
+            (void) jpeg_start_decompress(&cinfo);
+            jpegSmoothScaler scaler(&cinfo, scaledSize, clip);
+            *outImage = scaler.scale();
+        } else
+#endif
+        {
+            // Allocate memory for the clipped QImage.
+            if (!ensureValidImage(outImage, &cinfo, clip.size()))
                 longjmp(jerr.setjmp_buffer, 1);
+        } else if (params.contains(QLatin1String("Scale"))) {
+#if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(Q_OS_WINCE)
+            sscanf_s(params.toLatin1().data(), "Scale(%i, %i, %1023s)",
+                     &sWidth, &sHeight, sModeStr, sizeof(sModeStr));
+#else
+            sscanf(params.toLatin1().data(), "Scale(%i, %i, %1023s)",
+                   &sWidth, &sHeight, sModeStr);
+#endif
+            QString sModeQStr(QString::fromLatin1(sModeStr));
+            if (sModeQStr == QLatin1String("IgnoreAspectRatio")) {
+                sMode = Qt::IgnoreAspectRatio;
+            } else if (sModeQStr == QLatin1String("KeepAspectRatio")) {
+                sMode = Qt::KeepAspectRatio;
+            } else if (sModeQStr == QLatin1String("KeepAspectRatioByExpanding")) {
+                sMode = Qt::KeepAspectRatioByExpanding;
+            } else {
+                qDebug("read_jpeg_image: invalid aspect ratio mode \"%s\", see QImage::AspectRatioMode documentation", sModeStr);
+                sMode = Qt::KeepAspectRatio;
+            }
+//            qDebug("Parameters ask to scale the image to %i x %i AspectRatioMode: %s", sWidth, sHeight, sModeStr);
+            scaleSize(sWidth, sHeight, cinfo.output_width, cinfo.output_height, sMode);
+//            qDebug("Scaling the jpeg to %i x %i", sWidth, sHeight, sModeStr);
+            if (cinfo.output_components == 3 || cinfo.output_components == 4) {
+                if (outImage->size() != QSize(sWidth, sHeight) || outImage->format() != QImage::Format_RGB32)
+                    *outImage = QImage(sWidth, sHeight, QImage::Format_RGB32);
+            } else if (cinfo.output_components == 1) {
+                if (outImage->size() != QSize(sWidth, sHeight) || outImage->format() != QImage::Format_Indexed8)
+                    *outImage = QImage(sWidth, sHeight, QImage::Format_Indexed8);
+                outImage->setNumColors(256);
+                for (int i = 0; i < 256; ++i)
+                    outImage->setColor(i, qRgb(i,i,i));
+            } else {
+                // Unsupported format
+            }
+            if (outImage->isNull())
+                longjmp(jerr.setjmp_buffer, 1);
+            if (!outImage->isNull()) {
+                QImage tmpImage(cinfo.output_width, 1, QImage::Format_RGB32);
+                uchar* inData = tmpImage.bits();
+                uchar* outData = outImage->bits();
+                int out_bpl = outImage->bytesPerLine();
+            // Avoid memcpy() overhead if grayscale with no clipping.
+            bool quickGray = (cinfo.output_components == 1 &&
+                              clip == imageRect);
+            if (!quickGray) {
+                // Ask the jpeg library to allocate a temporary row.
+                // The library will automatically delete it for us later.
+                // The libjpeg docs say we should do this before calling
+                // jpeg_start_decompress().  We can't use "new" here
+                // because we are inside the setjmp() block and an error
+                // in the jpeg input stream would cause a memory leak.
+                JSAMPARRAY rows = (cinfo.mem->alloc_sarray)
+                    ((j_common_ptr)&cinfo, JPOOL_IMAGE,
+                     cinfo.output_width * cinfo.output_components, 1);
+                (void) jpeg_start_decompress(&cinfo);
                 while (cinfo.output_scanline < cinfo.output_height) {
+                    int outputLine = sHeight * cinfo.output_scanline / cinfo.output_height;
+                    (void) jpeg_read_scanlines(&cinfo, &inData, 1);
+                    int y = int(cinfo.output_scanline) - clip.y();
+                    if (y >= clip.height())
+                        break;      // We've read the entire clip region, so abort.
+                    (void) jpeg_read_scanlines(&cinfo, rows, 1);
+                    if (y < 0)
+                        continue;   // Haven't reached the starting line yet.
                     if (cinfo.output_components == 3) {
+                        uchar *in = inData;
+                        QRgb *out = (QRgb*)outData + outputLine * out_bpl;
+                        for (uint i=0; i<cinfo.output_width; i++) {
+// ### Only scaling down an image works, I don't think scaling up will work at the moment
+// ### An idea I have to make this a smooth scale is to progressively add the pixel values up
+// When scaling down, multiple values are being over drawn in to the output buffer.
+// Instead, a weighting based on the distance the line or pixel is from the output pixel determines
+// the weight of it when added to the output buffer. At present it is a non-smooth scale which is
+// inefficently implemented, it still uncompresses all the jpeg, an optimization for progressive
+// jpegs could be made if scaling by say 50% or some other special cases
+                            out[sWidth * i / cinfo.output_width] = qRgb(in[0], in[1], in[2]);
+                        // Expand 24->32 bpp.
+                        uchar *in = rows[0] + clip.x() * 3;
+                        QRgb *out = (QRgb*)outImage->scanLine(y);
+                        for (int i = 0; i < clip.width(); ++i) {
+                            *out++ = qRgb(in[0], in[1], in[2]);
                             in += 3;
+                        }
+                    } else {
+// ### Need to test the case where the jpeg is grayscale, need some black and white jpegs to test
+// this code. (also only scales down and probably won't scale to a larger size)
+                        uchar *in = inData;
+                        uchar *out = outData + outputLine*out_bpl;
+                        for (uint i=0; i<cinfo.output_width; i++) {
+                            out[sWidth * i / cinfo.output_width] = in[i];
+                    } else if (cinfo.out_color_space == JCS_CMYK) {
+                        // Convert CMYK->RGB.
+                        uchar *in = rows[0] + clip.x() * 4;
+                        QRgb *out = (QRgb*)outImage->scanLine(y);
+                        for (int i = 0; i < clip.width(); ++i) {
+                            int k = in[3];
+                            *out++ = qRgb(k * in[0] / 255, k * in[1] / 255,
+                                          k * in[2] / 255);
+                            in += 4;
+                        }
+                    }
+                }
                 (void) jpeg_finish_decompress(&cinfo);
+            }
+#ifndef QT_NO_IMAGE_SMOOTHSCALE
+        } else if (scaledSize.isValid()) {
+            jpegSmoothScaler scaler(&cinfo, QString().sprintf("Scale( %d, %d, ScaleFree )",
+                                                              scaledSize.width(),
+                                                              scaledSize.height()).toLatin1().data());
+            *outImage = scaler.scale();
+#endif
+        } else {
+            if (!ensureValidImage(outImage, &cinfo))
+                longjmp(jerr.setjmp_buffer, 1);
+            uchar* data = outImage->bits();
+            int bpl = outImage->bytesPerLine();
+            while (cinfo.output_scanline < cinfo.output_height) {
+                uchar *d = data + cinfo.output_scanline * bpl;
+                (void) jpeg_read_scanlines(&cinfo,
+                                           &d,
+);
+            }
+            (void) jpeg_finish_decompress(&cinfo);
+            if (cinfo.output_components == 3) {
+                // Expand 24->32 bpp.
+                for (uint j=0; j<cinfo.output_height; j++) {
+                    uchar *in = outImage->scanLine(j) + cinfo.output_width * 3;
+                    QRgb *out = (QRgb*)outImage->scanLine(j);
+                    for (uint i=cinfo.output_width; i--;) {
+                        in-=3;
+                        out[i] = qRgb(in[0], in[1], in[2]);
+                    }
+                }
+            } else if (cinfo.out_color_space == JCS_CMYK) {
+                for (uint j = 0; j < cinfo.output_height; ++j) {
+                    uchar *in = outImage->scanLine(j) + cinfo.output_width * 4;
+                    QRgb *out = (QRgb*)outImage->scanLine(j);
+                    for (uint i = cinfo.output_width; i--; ) {
+                        in-=4;
+                        int k = in[3];
+                        out[i] = qRgb(k * in[0] / 255, k * in[1] / 255, k * in[2] / 255);
+                    }
+                }
+            }
             if (cinfo.density_unit == 1) {
                 outImage->setDotsPerMeterX(int(100. * cinfo.X_density / 2.54));
 …
                 outImage->setDotsPerMeterY(int(100. * cinfo.Y_density));
+            }
+        }
+    }
 …
     jpeg_destroy_decompress(&cinfo);
     delete iod_src;
     return !outImage->isNull();
+}
 …
         case QImage::Format_Indexed8:
             gray = true;
             for (int i = image.numColors(); gray && i--;) {
+            for (int i = image.(); gray && i--;) {
                 gray = gray & (qRed(cmap[i]) == qGreen(cmap[i]) &&
                                qRed(cmap[i]) == qBlue(cmap[i]));
 …
     if (!canRead())
         return false;
     return read_jpeg_image(device(), image, parameters, scaledSize, quality);
+    return read_jpeg_image(device(), image, , quality);
+}
 …
+{
     return option == Quality
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
         || option == ScaledSize
+#endif
+        || option == ScaledClipRect
+        || option == ClipRect
         || option == Size
         || option == ImageFormat;
 …
     if (option == Quality) {
         return quality;
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
     } else if  (option == ScaledSize) {
         return scaledSize;
+#endif
+    } else if  (option == ScaledClipRect) {
+        return scaledClipRect;
+    } else if  (option == ClipRect) {
+        return clipRect;
     } else if (option == Size) {
         if (canRead() && !device()->isSequential()) {
 …
     if (option == Quality)
         quality = value.toInt();
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
     else if ( option == ScaledSize )
         scaledSize = value.toSize();
+#endif
+    else if ( option == ScaledClipRect )
+        scaledClipRect = value.toRect();
+    else if ( option == ClipRect )
+        clipRect = value.toRect();
+}

branches/vendor/nokia/qt/current/src/plugins/imageformats/jpeg/qjpeghandler.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <QtGui/qimageiohandler.h>
 #include <QtCore/QSize>
 QT_BEGIN_NAMESPACE
 …
 private:
     int quality;
-    QByteArray parameters;
     QSize scaledSize;
 };

branches/vendor/nokia/qt/current/src/plugins/imageformats/mng/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/mng/mng.pro

-              r2
+              r556
 SOURCES += main.cpp \
            qmnghandler.cpp
 contains(QT_CONFIG, system-mng) {
 …
 target.path += $$[QT_INSTALL_PLUGINS]/imageformats
 INSTALLS += target

branches/vendor/nokia/qt/current/src/plugins/imageformats/mng/qmnghandler.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QMngHandler::~QMngHandler()
+{
-    Q_D(QMngHandler);
-    delete d;
+}

branches/vendor/nokia/qt/current/src/plugins/imageformats/mng/qmnghandler.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #define QMNGHANDLER_H
 #include <QtGui/qimageiohandler.h>
 …
     private:
     Q_DECLARE_PRIVATE(QMngHandler)
     QMngHandlerPrivate *d_ptr;
+    Qd_ptr;
 };

branches/vendor/nokia/qt/current/src/plugins/imageformats/svg/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/svg/qsvgiohandler.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     bool load(QIODevice *device);
     QSvgRenderer *r;
 …
+}
 QSvgIOHandler::QSvgIOHandler()
     : d(new QSvgIOHandlerPrivate())
 …
 bool QSvgIOHandler::canRead() const
+{
+    QByteArray contents = device()->peek(80);
+    return contents.contains("<svg");
+    return QSvgIOHandlerPrivate::findSvgTag(device());
+}
 …
 bool QSvgIOHandler::canRead(QIODevice *device)
+{
+    QByteArray contents = device->peek(80);
+    return contents.contains("<svg");
+    return QSvgIOHandlerPrivate::findSvgTag(device);
+}

branches/vendor/nokia/qt/current/src/plugins/imageformats/svg/qsvgiohandler.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/svg/svg.pro

r2	r556
10	10	target.path += $$[QT_INSTALL_PLUGINS]/imageformats
11	11	INSTALLS += target
	12
	13

branches/vendor/nokia/qt/current/src/plugins/imageformats/tiff/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/tiff/qtiffhandler.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 …
+}
 QTiffHandler::QTiffHandler() : QImageIOHandler()
+{
 …
         return false;
+    TIFF *tiff = TIFFClientOpen("foo",
+                                "r",
+                                this,
+                                qtiffReadProc,
+                                qtiffWriteProc,
+                                qtiffSeekProc,
+                                qtiffCloseProc,
+                                qtiffSizeProc,
+                                qtiffMapProc,
+                                qtiffUnmapProc);
+    if (tiff) {
+        uint32 width = 0;
+        uint32 height = 0;
+        TIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &width);
+        TIFFGetField(tiff, TIFFTAG_IMAGELENGTH, &height);
+        if (image->size() != QSize(width, height) || image->format() != QImage::Format_ARGB32)
+            *image = QImage(width, height, QImage::Format_ARGB32);
+    TIFF *const tiff = TIFFClientOpen("foo",
+                                      "r",
+                                      this,
+                                      qtiffReadProc,
+                                      qtiffWriteProc,
+                                      qtiffSeekProc,
+                                      qtiffCloseProc,
+                                      qtiffSizeProc,
+                                      qtiffMapProc,
+                                      qtiffUnmapProc);
+    if (!tiff) {
+        return false;
+    }
+    uint32 width;
+    uint32 height;
+    uint16 photometric;
+    if (!TIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &width)
+        || !TIFFGetField(tiff, TIFFTAG_IMAGELENGTH, &height)
+        || !TIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric)) {
+        TIFFClose(tiff);
+        return false;
+    }
+    // BitsPerSample defaults to 1 according to the TIFF spec.
+    uint16 bitPerSample;
+    if (!TIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bitPerSample))
+        bitPerSample = 1;
+    bool grayscale = photometric == PHOTOMETRIC_MINISBLACK || photometric == PHOTOMETRIC_MINISWHITE;
+    if (grayscale && bitPerSample == 1) {
+        if (image->size() != QSize(width, height) || image->format() != QImage::Format_Mono)
+            *image = QImage(width, height, QImage::Format_Mono);
+        QVector<QRgb> colortable(2);
+        if (photometric == PHOTOMETRIC_MINISBLACK) {
+            colortable[0] = 0xff000000;
+            colortable[1] = 0xffffffff;
+        } else {
+            colortable[0] = 0xffffffff;
+            colortable[1] = 0xff000000;
+        }
+        image->setColorTable(colortable);
         if (!image->isNull()) {
+            if (TIFFReadRGBAImageOriented(tiff, width, height, reinterpret_cast<uint32 *>(image->bits()), ORIENTATION_TOPLEFT, 0)) {
+                uint16 resUnit = RESUNIT_NONE;
+                float resX = 0;
+                float resY = 0;
+                TIFFGetField(tiff, TIFFTAG_RESOLUTIONUNIT, &resUnit);
+                TIFFGetField(tiff, TIFFTAG_XRESOLUTION, &resX);
+                TIFFGetField(tiff, TIFFTAG_YRESOLUTION, &resY);
+                switch(resUnit) {
+                    case RESUNIT_CENTIMETER:
+                        image->setDotsPerMeterX(qRound(resX * 100));
+                        image->setDotsPerMeterY(qRound(resY * 100));
+                        break;
+                    case RESUNIT_INCH:
+                        image->setDotsPerMeterX(qRound(resX * (100 / 2.54)));
+                        image->setDotsPerMeterY(qRound(resY * (100 / 2.54)));
+                        break;
+                    default:
+                        // do nothing as defaults have already
+                                                // been set within the QImage class
+                        break;
+                }
+                for (uint32 y=0; y<height; ++y)
+                    convert32BitOrder(image->scanLine(y), width);
+            } else {
+                *image = QImage();
+            }
+        }
+            for (uint32 y=0; y<height; ++y) {
+                if (TIFFReadScanline(tiff, image->scanLine(y), y, 0) < 0) {
+                    TIFFClose(tiff);
+                    return false;
+                }
+            }
+        }
+    } else {
+        if ((grayscale || photometric == PHOTOMETRIC_PALETTE) && bitPerSample == 8) {
+            if (image->size() != QSize(width, height) || image->format() != QImage::Format_Indexed8)
+                *image = QImage(width, height, QImage::Format_Indexed8);
+            if (!image->isNull()) {
+                const uint16 tableSize = 256;
+                QVector<QRgb> qtColorTable(tableSize);
+                if (grayscale) {
+                    for (int i = 0; i<tableSize; ++i) {
+                        const int c = (photometric == PHOTOMETRIC_MINISBLACK) ? i : (255 - i);
+                        qtColorTable[i] = qRgb(c, c, c);
+                    }
+                } else {
+                    // create the color table
+                    uint16 *redTable = static_cast<uint16 *>(qMalloc(tableSize * sizeof(uint16)));
+                    uint16 *greenTable = static_cast<uint16 *>(qMalloc(tableSize * sizeof(uint16)));
+                    uint16 *blueTable = static_cast<uint16 *>(qMalloc(tableSize * sizeof(uint16)));
+                    if (!redTable || !greenTable || !blueTable) {
+                        TIFFClose(tiff);
+                        return false;
+                    }
+                    if (!TIFFGetField(tiff, TIFFTAG_COLORMAP, &redTable, &greenTable, &blueTable)) {
+                        TIFFClose(tiff);
+                        return false;
+                    }
+                    for (int i = 0; i<tableSize ;++i) {
+                        const int red = redTable[i] / 257;
+                        const int green = greenTable[i] / 257;
+                        const int blue = blueTable[i] / 257;
+                        qtColorTable[i] = qRgb(red, green, blue);
+                    }
+                }
+                image->setColorTable(qtColorTable);
+                for (uint32 y=0; y<height; ++y) {
+                    if (TIFFReadScanline(tiff, image->scanLine(y), y, 0) < 0) {
+                        TIFFClose(tiff);
+                        return false;
+                    }
+                }
+                // free redTable, greenTable and greenTable done by libtiff
+            }
+        } else {
+            if (image->size() != QSize(width, height) || image->format() != QImage::Format_ARGB32)
+                *image = QImage(width, height, QImage::Format_ARGB32);
+            if (!image->isNull()) {
+                const int stopOnError = 1;
+                if (TIFFReadRGBAImageOriented(tiff, width, height, reinterpret_cast<uint32 *>(image->bits()), ORIENTATION_TOPLEFT, stopOnError)) {
+                    for (uint32 y=0; y<height; ++y)
+                        convert32BitOrder(image->scanLine(y), width);
+                } else {
+                    TIFFClose(tiff);
+                    return false;
+                }
+            }
+        }
+    }
+    if (image->isNull()) {
         TIFFClose(tiff);
+    }
+    if (image->isNull())
+        return false;
+        return false;
+    }
+    float resX = 0;
+    float resY = 0;
+    uint16 resUnit = RESUNIT_NONE;
+    if (TIFFGetField(tiff, TIFFTAG_RESOLUTIONUNIT, &resUnit)
+        && TIFFGetField(tiff, TIFFTAG_XRESOLUTION, &resX)
+        && TIFFGetField(tiff, TIFFTAG_YRESOLUTION, &resY)) {
+        switch(resUnit) {
+        case RESUNIT_CENTIMETER:
+            image->setDotsPerMeterX(qRound(resX * 100));
+            image->setDotsPerMeterY(qRound(resY * 100));
+            break;
+        case RESUNIT_INCH:
+            image->setDotsPerMeterX(qRound(resX * (100 / 2.54)));
+            image->setDotsPerMeterY(qRound(resY * (100 / 2.54)));
+            break;
+        default:
+            // do nothing as defaults have already
+            // been set within the QImage class
+            break;
+        }
+    }
+    // rotate the image if the orientation is defined in the file
+    uint16 orientationTag;
+    if (TIFFGetField(tiff, TIFFTAG_ORIENTATION, &orientationTag)) {
+        if (image->format() == QImage::Format_ARGB32) {
+            // TIFFReadRGBAImageOriented() flip the image but does not rotate them
+            switch (orientationTag) {
+            case 5:
+                rotate_right_mirror_horizontal(image);
+                break;
+            case 6:
+                rotate_right_mirror_vertical(image);
+                break;
+            case 7:
+                rotate_right_mirror_horizontal(image);
+                break;
+            case 8:
+                rotate_right_mirror_vertical(image);
+                break;
+            }
+        } else {
+            switch (orientationTag) {
+            case 1: // default orientation
+                break;
+            case 2: // mirror horizontal
+                *image = image->mirrored(true, false);
+                break;
+            case 3: // mirror both
+                *image = image->mirrored(true, true);
+                break;
+            case 4: // mirror vertical
+                *image = image->mirrored(false, true);
+                break;
+            case 5: // rotate right mirror horizontal
+                {
+                    QMatrix transformation;
+                    transformation.rotate(90);
+                    *image = image->transformed(transformation);
+                    *image = image->mirrored(true, false);
+                    break;
+                }
+            case 6: // rotate right
+                {
+                    QMatrix transformation;
+                    transformation.rotate(90);
+                    *image = image->transformed(transformation);
+                    break;
+                }
+            case 7: // rotate right, mirror vertical
+                {
+                    QMatrix transformation;
+                    transformation.rotate(90);
+                    *image = image->transformed(transformation);
+                    *image = image->mirrored(false, true);
+                    break;
+                }
+            case 8: // rotate left
+                {
+                    QMatrix transformation;
+                    transformation.rotate(270);
+                    *image = image->transformed(transformation);
+                    break;
+                }
+            }
+        }
+    }
+    TIFFClose(tiff);
     return true;
+}
 bool QTiffHandler::write(const QImage &image)
+{
 …
         return false;
+    TIFF *tiff = TIFFClientOpen("foo",
+                                "w",
+                                this,
+                                qtiffReadProc,
+                                qtiffWriteProc,
+                                qtiffSeekProc,
+                                qtiffCloseProc,
+                                qtiffSizeProc,
+                                qtiffMapProc,
+                                qtiffUnmapProc);
+    if (tiff) {
+        int width = image.width();
+        int height = image.height();
+        int depth = 32;
+        if (!TIFFSetField(tiff, TIFFTAG_IMAGEWIDTH, width)
+                || !TIFFSetField(tiff, TIFFTAG_IMAGELENGTH, height)
+                || !TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB)
+                || !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_LZW)
+                || !TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, depth/8)
+                || !TIFFSetField(tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG)
+                || !TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8)) {
+    TIFF *const tiff = TIFFClientOpen("foo",
+                                      "w",
+                                      this,
+                                      qtiffReadProc,
+                                      qtiffWriteProc,
+                                      qtiffSeekProc,
+                                      qtiffCloseProc,
+                                      qtiffSizeProc,
+                                      qtiffMapProc,
+                                      qtiffUnmapProc);
+    if (!tiff)
+        return false;
+    const int width = image.width();
+    const int height = image.height();
+    if (!TIFFSetField(tiff, TIFFTAG_IMAGEWIDTH, width)
+        || !TIFFSetField(tiff, TIFFTAG_IMAGELENGTH, height)
+        || !TIFFSetField(tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG)) {
+        TIFFClose(tiff);
+        return false;
+    }
+    // set the resolution
+    bool  resolutionSet = false;
+    const int dotPerMeterX = image.dotsPerMeterX();
+    const int dotPerMeterY = image.dotsPerMeterY();
+    if ((dotPerMeterX % 100) == 0
+        && (dotPerMeterY % 100) == 0) {
+        resolutionSet = TIFFSetField(tiff, TIFFTAG_RESOLUTIONUNIT, RESUNIT_CENTIMETER)
+                        && TIFFSetField(tiff, TIFFTAG_XRESOLUTION, dotPerMeterX/100.0)
+                        && TIFFSetField(tiff, TIFFTAG_YRESOLUTION, dotPerMeterY/100.0);
+    } else {
+        resolutionSet = TIFFSetField(tiff, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH)
+                        && TIFFSetField(tiff, TIFFTAG_XRESOLUTION, static_cast<float>(image.logicalDpiX()))
+                        && TIFFSetField(tiff, TIFFTAG_YRESOLUTION, static_cast<float>(image.logicalDpiY()));
+    }
+    if (!resolutionSet) {
+        TIFFClose(tiff);
+        return false;
+    }
+    // configure image depth
+    const QImage::Format format = image.format();
+    if (format == QImage::Format_Mono || format == QImage::Format_MonoLSB) {
+        uint16 photometric = PHOTOMETRIC_MINISBLACK;
+        if (image.colorTable().at(0) == 0xffffffff)
+            photometric = PHOTOMETRIC_MINISWHITE;
+        if (!TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, photometric)
+            || !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_CCITTRLE)
+            || !TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 1)) {
             TIFFClose(tiff);
             return false;
+        }
         // try to do the ARGB32 conversion in chunks no greater than 16 MB
         int chunks = (width * height * 4 / (1024 * 1024 * 16)) + 1;
 …
+        }
         TIFFClose(tiff);
+    } else {
+        return false;
+    }
+    }
     return true;
+}

branches/vendor/nokia/qt/current/src/plugins/imageformats/tiff/qtiffhandler.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/imageformats/tiff/tiff.pro

r2	r556
57	57	SOURCES += ../../../corelib/kernel/qfunctions_wince.cpp
58	58	}
	59
	60
	61
59	62	}
60	63
…	…
69	72	target.path += $$[QT_INSTALL_PLUGINS]/imageformats
70	73	INSTALLS += target
	74
	75

branches/vendor/nokia/qt/current/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/phonon/phonon.pro

-              r2
+              r556
 wince*:contains(QT_CONFIG, phonon-backend): SUBDIRS *= waveout
 wince*:contains(QT_CONFIG, directshow): SUBDIRS *= ds9

branches/vendor/nokia/qt/current/src/plugins/phonon/qt7/qt7.pro

r2	r556
13	13	}
14	14
15		LIBS += -framework AudioUnit \
	15	LIBS += -framework AudioUnit \
16	16	-framework AudioToolbox -framework CoreAudio \
17	17	-framework QuartzCore -framework QTKit

branches/vendor/nokia/qt/current/src/plugins/plugins.pro

-              r2
+              r556
 SUBDIRS *= accessible imageformats sqldrivers iconengines script
 unix {
+unix {
         contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs
 } else {
 …
 !embedded:SUBDIRS *= graphicssystems
 embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
+!win32:!embedded:!mac:SUBDIRS *= inputmethods
+!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
+symbian:SUBDIRS += s60
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon

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

-              r2
+              r556
 TEMPLATE = lib
 isEmpty(QT_MAJOR_VERSION) {
    VERSION=4.5.1
+   VERSION=4..1
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 …
 wince*:LIBS += $$QMAKE_LIBS_GUI

branches/vendor/nokia/qt/current/src/plugins/script/qtdbus/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/script/qtdbus/main.h

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/script/script.pro

r2	r556
1	1	TEMPLATE = subdirs
2		contains(QT_CONFIG, dbus):SUBDIRS += qtdbus
	2	contains(QT_CONFIG, dbus):SUBDIRS += qtdbus

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/db2/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/ibase/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/mysql/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/oci/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/odbc/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/odbc/odbc.pro

-              r2
+              r556
                   ../../../sql/drivers/odbc/qsql_odbc.cpp
-mac {
-        !contains( LIBS, .*odbc.* ) {
-            LIBS        *= -liodbc
+        }
+}
 unix {
         !contains( LIBS, .*odbc.* ) {
             LIBS        *= -lodbc
+            LIBS        *=
+        }
+}

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/psql/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/sqldrivers.pro

r2	r556
10	10	contains(sql-plugins, sqlite2) : SUBDIRS += sqlite2
11	11	contains(sql-plugins, ibase) : SUBDIRS += ibase
	12
	13

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/sqlite/smain.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/sqlite2/smain.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/tds/main.cpp

-              r2
+              r556
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the plugins of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you
+** @nokia.com.
 ** $QT_END_LICENSE$
 **

Context Navigation

Legend:

Download in other formats: