Changeset 561 for trunk/src/gui/dialogs

trunk

Property svn:mergeinfo set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible
/branches/vendor/nokia/qt/current merged eligible
/branches/vendor/trolltech/qt/current 3-149

trunk/src/gui/dialogs/dialogs.pri

-              r2
+              r561
         dialogs/qcolordialog.h \
         dialogs/qcolordialog_p.h \
+        dialogs/qfscompleter_p.h \
         dialogs/qdialog.h \
         dialogs/qdialog_p.h \
 …
 !embedded:mac {
+    OBJECTIVE_SOURCES += dialogs/qcolordialog_mac.mm \
+                         dialogs/qfiledialog_mac.mm \
+    OBJECTIVE_SOURCES += dialogs/qfiledialog_mac.mm \
                          dialogs/qfontdialog_mac.mm \
                          dialogs/qnspanelproxy_mac.mm \
                          dialogs/qpagesetupdialog_mac.mm \
                          dialogs/qprintdialog_mac.mm
+# Compile qcolordialog_mac.mm with exception support, disregarding the -no-exceptions
+# configure option. (qcolordialog_mac needs to catch exceptions thrown by cocoa)
+    EXCEPTION_SOURCES = dialogs/qcolordialog_mac.mm
+    exceptions_compiler.commands = $$QMAKE_CXX -c
+    exceptions_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+    exceptions_compiler.commands += -fexceptions
+    exceptions_compiler.dependency_type = TYPE_C
+    exceptions_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+    exceptions_compiler.input = EXCEPTION_SOURCES
+    exceptions_compiler.variable_out = OBJECTS
+    exceptions_compiler.name = compiling[exceptopns] ${QMAKE_FILE_IN}
+    silent:exceptions_compiler.commands = @echo compiling[exceptopns] ${QMAKE_FILE_IN} && $$exceptions_compiler.commands
+    QMAKE_EXTRA_COMPILERS += exceptions_compiler
+}
 win32 {
     HEADERS += dialogs/qwizard_win_p.h
 …
+}
 !mac:!embedded:unix {
+!mac:!embedded:!symbian:unix {
         HEADERS += dialogs/qpagesetupdialog_unix_p.h
         SOURCES += dialogs/qprintdialog_unix.cpp \
 …
+}
 wince*: FORMS += dialogs/qfiledialog_wince.ui
+wince*|symbian: FORMS += dialogs/qfiledialog_embedded.ui
 else: FORMS += dialogs/qfiledialog.ui

trunk/src/gui/dialogs/qabstractpagesetupdialog.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qabstractpagesetupdialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qabstractpagesetupdialog_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qabstractprintdialog.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \brief The QAbstractPrintDialog class provides a base implementation for
     print dialogs used to configure printers.
+    \ingroup printing
     This class implements getter and setter functions that are used to
 …
     the printer's configuration.
+    \ingroup dialogs
+    \ingroup standard-dialogs
+    \ingroup printing
     The dialog allows users to change document-related settings, such
 …
     On Windows and Mac OS X, the native print dialog is used, which means that
     some QWidget and QDialog properties set on the dialog won't be respected.
+    The native print dialog on
+    Mac OS X does not support setting printer options, i.e.
+    QAbstractPrintDialog::setEnabledOptions() and
+    QAbstractPrintDialog::addEnabledOption() have no effect.
+    In Qt 4.4, it was possible to use the satic functions to show a sheet on
+    The native print dialog on Mac OS X does not support setting printer options,
+    i.e. setOptions() and setOption() have no effect.
+    In Qt 4.4, it was possible to use the static functions to show a sheet on
     Mac OS X. This is no longer supported in Qt 4.5. If you want this
     functionality, use QPrintDialog::open().

trunk/src/gui/dialogs/qabstractprintdialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qabstractprintdialog_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qcolordialog.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qspinbox.h"
 #include "qdialogbuttonbox.h"
+#include "private/qguiplatformplugin_p.h"
+#ifdef Q_WS_S60
+#include "private/qt_s60_p.h"
+#endif
 QT_BEGIN_NAMESPACE
 …
     gl->setMargin(gl->spacing());
     lab = new QColorShowLabel(this);
+#ifndef Q_OS_WINCE
+#ifdef Q_WS_S60
+    QS60Data s60Data = QS60Data();
+    const bool nonTouchUI = !s60Data.hasTouchscreen;
+#endif
+#ifndef Q_WS_WINCE
+#ifdef Q_WS_S60
+    lab->setMinimumHeight(60);
+#endif
     lab->setMinimumWidth(60);
 #else
     lab->setMinimumWidth(20);
 #endif
+// In S60, due to small screen and different screen layouts need to re-arrange the widgets.
+// For QVGA screens only the comboboxes and color label are visible.
+// For nHD screens only color and luminence pickers and color label are visible.
+#ifndef Q_WS_S60
     gl->addWidget(lab, 0, 0, -1, 1);
+#else
+    if (nonTouchUI)
+        gl->addWidget(lab, 0, 0, 1, -1);
+    else
+        gl->addWidget(lab, 0, 0, -1, 1);
+#endif
     connect(lab, SIGNAL(colorDropped(QRgb)), this, SIGNAL(newCol(QRgb)));
     connect(lab, SIGNAL(colorDropped(QRgb)), this, SLOT(setRgb(QRgb)));
 …
 #endif
     lblHue->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+#ifndef Q_WS_S60
     gl->addWidget(lblHue, 0, 1);
     gl->addWidget(hEd, 0, 2);
+#else
+    if (nonTouchUI) {
+        gl->addWidget(lblHue, 1, 0);
+        gl->addWidget(hEd, 2, 0);
+    } else {
+        lblHue->hide();
+        hEd->hide();
+    }
+#endif
     sEd = new QColSpinBox(this);
 …
 #endif
     lblSat->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+#ifndef Q_WS_S60
     gl->addWidget(lblSat, 1, 1);
     gl->addWidget(sEd, 1, 2);
+#else
+    if (nonTouchUI) {
+        gl->addWidget(lblSat, 1, 1);
+        gl->addWidget(sEd, 2, 1);
+    } else {
+        lblSat->hide();
+        sEd->hide();
+    }
+#endif
     vEd = new QColSpinBox(this);
 …
 #endif
     lblVal->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+#ifndef Q_WS_S60
     gl->addWidget(lblVal, 2, 1);
     gl->addWidget(vEd, 2, 2);
+#else
+    if (nonTouchUI) {
+        gl->addWidget(lblVal, 1, 2);
+        gl->addWidget(vEd, 2, 2);
+    } else {
+        lblVal->hide();
+        vEd->hide();
+    }
+#endif
     rEd = new QColSpinBox(this);
 …
 #endif
     lblRed->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+#ifndef Q_WS_S60
     gl->addWidget(lblRed, 0, 3);
     gl->addWidget(rEd, 0, 4);
+#else
+    if (nonTouchUI) {
+        gl->addWidget(lblRed, 3, 0);
+        gl->addWidget(rEd, 4, 0);
+    } else {
+        lblRed->hide();
+        rEd->hide();
+    }
+#endif
     gEd = new QColSpinBox(this);
 …
 #endif
     lblGreen->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+#ifndef Q_WS_S60
     gl->addWidget(lblGreen, 1, 3);
     gl->addWidget(gEd, 1, 4);
+#else
+    if (nonTouchUI) {
+        gl->addWidget(lblGreen, 3, 1);
+        gl->addWidget(gEd, 4, 1);
+    } else {
+        lblGreen->hide();
+        gEd->hide();
+    }
+#endif
     bEd = new QColSpinBox(this);
 …
 #endif
     lblBlue->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+#ifndef Q_WS_S60
     gl->addWidget(lblBlue, 2, 3);
     gl->addWidget(bEd, 2, 4);
+#else
+    if (nonTouchUI) {
+        gl->addWidget(lblBlue, 3, 2);
+        gl->addWidget(bEd, 4, 2);
+    } else {
+        lblBlue->hide();
+        bEd->hide();
+    }
+#endif
     alphaEd = new QColSpinBox(this);
 …
 #endif
     alphaLab->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+#ifndef Q_WS_S60
     gl->addWidget(alphaLab, 3, 1, 1, 3);
     gl->addWidget(alphaEd, 3, 4);
+#else
+    if (nonTouchUI) {
+        gl->addWidget(alphaLab, 1, 3, 3, 1);
+        gl->addWidget(alphaEd, 4, 3);
+    } else {
+        alphaLab->hide();
+        alphaEd->hide();
+    }
+#endif
     alphaEd->hide();
     alphaLab->hide();
 …
+{
     QColor oldQColor(curQColor);
     curQColor.setRgba(qRgba(qRed(curCol), qGreen(curCol), qBlue(curCol), qAlpha(curCol)));
+    curQColor.setRgba(qRgba(qRed(curCol), qGreen(curCol), qBlue(curCol), currentAlpha()));
     if (curQColor != oldQColor)
         emit currentColorChanged(curQColor);
 …
     q->setWindowTitle(QColorDialog::tr("Select Color"));
+    nativeDialogInUse = false;
     nextCust = 0;
     QVBoxLayout *mainLay = new QVBoxLayout(q);
 …
     leftLay = 0;
 #if defined(Q_OS_WINCE)
+#if (defined(Q_WS_WINCE) || defined(Q_WS_S60))
     smallDisplay = true;
     const int lumSpace = 20;
 …
     // small displays (e.g. PDAs) cannot fit the full color dialog,
     // so just use the color picker.
     smallDisplay = (qApp->desktop()->width() < 480 || qApp->desktop()->height() < 350);
+    smallDisplay = (QApplication::desktop()->width() < 480 || QApplication::desktop()->height() < 350);
     const int lumSpace = topLay->spacing() / 2;
 #endif
 …
 #endif
+#if defined(Q_WS_S60)
+    QS60Data s60Data = QS60Data();
+    const bool nonTouchUI = !s60Data.hasTouchscreen;
+#endif
     if (!smallDisplay) {
         standard = new QColorWell(q, 6, 8, stdrgb);
 …
         leftLay->addWidget(standard);
 #if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
         leftLay->addStretch();
 #endif
 …
     } else {
         // better color picker size for small displays
+#ifdef Q_WS_S60
+        QSize screenSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size();
+        pWidth = pHeight = qMin(screenSize.width(), screenSize.height());
+        pHeight -= 20;
+        if(screenSize.height() > screenSize.width())
+            pWidth -= 20;
+#else
         pWidth = 150;
         pHeight = 100;
+#endif
         custom = 0;
         standard = 0;
 …
     cp->setFrameStyle(QFrame::Panel + QFrame::Sunken);
+#if defined(Q_WS_S60)
+    if (!nonTouchUI) {
+        pickLay->addWidget(cp);
+        cLay->addSpacing(lumSpace);
+    } else {
+        cp->hide();
+    }
+#else
     cLay->addSpacing(lumSpace);
     cLay->addWidget(cp);
+#endif
     cLay->addSpacing(lumSpace);
     lp = new QColorLuminancePicker(q);
+#if defined(Q_WS_S60)
+    QSize screenSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size();
+    const int minDimension = qMin(screenSize.height(), screenSize.width());
+    //set picker to be finger-usable
+    int pickerWidth = !nonTouchUI ? minDimension/9 : minDimension/12;
+    lp->setFixedWidth(pickerWidth);
+    if (!nonTouchUI)
+        pickLay->addWidget(lp);
+    else
+        lp->hide();
+#else
     lp->setFixedWidth(20);
     pickLay->addWidget(lp);
+#endif
     QObject::connect(cp, SIGNAL(newCol(int,int)), lp, SLOT(setCol(int,int)));
 …
     cs = new QColorShower(q);
     QObject::connect(cs, SIGNAL(newCol(QRgb)), q, SLOT(_q_newColorTypedIn(QRgb)));
+    QObject::connect(cs, SIGNAL(currentColorChanged(const QColor&)),
+                     q, SIGNAL(currentColorChanged(const QColor&)));
+    QObject::connect(cs, SIGNAL(currentColorChanged(QColor)),
+                     q, SIGNAL(currentColorChanged(QColor)));
+#if defined(Q_WS_S60)
+    if (!nonTouchUI)
+        pWidth -= cp->size().width();
+    topLay->addWidget(cs);
+#else
     rightLay->addWidget(cs);
+#endif
     buttons = new QDialogButtonBox(q);
 …
     \brief The QColorDialog class provides a dialog widget for specifying colors.
+    \mainclass
+    \ingroup dialogs
+    \ingroup multimedia
+    \ingroup standard-dialogs
     The color dialog's function is to allow users to choose colors.
 …
     Q_D(QColorDialog);
     d->setCurrentColor(color.rgb());
     d->selectColor(color.rgb());
+    d->selectColor(color);
     d->setCurrentAlpha(color.alpha());
 #ifdef Q_WS_MAC
+    if (d->delegate)
+        QColorDialogPrivate::setColor(d->delegate, color);
+#endif
+    d->setCurrentQColor(color);
+    d->setCocoaPanelColor(color);
+#endif
+    if (d->nativeDialogInUse)
+        qt_guiPlatformPlugin()->colorDialogSetCurrentColor(this, color);
+}
 …
 #if defined(Q_WS_MAC)
     if (visible) {
+        if (!d->delegate && QColorDialogPrivate::sharedColorPanelAvailable &&
+                !(testAttribute(Qt::WA_DontShowOnScreen) || (d->opts & DontUseNativeDialog))){
+            d->delegate = QColorDialogPrivate::openCocoaColorPanel(
+                    currentColor(), parentWidget(), windowTitle(), options(), d);
+        if (d->delegate || (QColorDialogPrivate::sharedColorPanelAvailable &&
+                !(testAttribute(Qt::WA_DontShowOnScreen) || (d->opts & DontUseNativeDialog)))){
+            d->openCocoaColorPanel(currentColor(), parentWidget(), windowTitle(), options());
             QColorDialogPrivate::sharedColorPanelAvailable = false;
             setAttribute(Qt::WA_DontShowOnScreen);
 …
     } else {
         if (d->delegate) {
+            QColorDialogPrivate::closeCocoaColorPanel(d->delegate);
+            d->delegate = 0;
+            QColorDialogPrivate::sharedColorPanelAvailable = true;
+            d->closeCocoaColorPanel();
             setAttribute(Qt::WA_DontShowOnScreen, false);
+        }
+    }
+#else
+    if (!(d->opts & DontUseNativeDialog) && qt_guiPlatformPlugin()->colorDialogSetVisible(this, visible)) {
+        d->nativeDialogInUse = true;
+        // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below
+        // updates the state correctly, but skips showing the non-native version:
+        setAttribute(Qt::WA_DontShowOnScreen);
+    } else {
+        d->nativeDialogInUse = false;
+        setAttribute(Qt::WA_DontShowOnScreen, false);
+    }
 #endif
 …
     \since 4.5
     Opens the dialog and connects its accepted() signal to the slot specified
+    Opens the dialog and connects its colorSelected() signal to the slot specified
     by \a receiver and \a member.
 …
+{
     Q_D(QColorDialog);
     connect(this, SIGNAL(colorSelected(const QColor&)), receiver, member);
+    connect(this, SIGNAL(colorSelected(QColor)), receiver, member);
     d->receiverToDisconnectOnClose = receiver;
     d->memberToDisconnectOnClose = member;
 …
 QColorDialog::~QColorDialog()
+{
+    Q_D(QColorDialog);
+#if defined(Q_WS_MAC)
+    if (d->delegate) {
+        d->releaseCocoaColorPanelDelegate();
+        QColorDialogPrivate::sharedColorPanelAvailable = true;
+    }
+#endif
 #ifndef QT_NO_SETTINGS
     if (!customSet) {
 …
+    }
 #endif
+    if (d->nativeDialogInUse)
+        qt_guiPlatformPlugin()->colorDialogDelete(this);
+}
 …
     QDialog::done(result);
     if (result == Accepted) {
         d->selectedQColor = d->currentQColor();
+        d->selectedQColor = d->currentQColor();
         emit colorSelected(d->selectedQColor);
     } else {
 …
+    }
     if (d->receiverToDisconnectOnClose) {
         disconnect(this, SIGNAL(colorSelected(const QColor&)),
+        disconnect(this, SIGNAL(colorSelected(QColor)),
                    d->receiverToDisconnectOnClose, d->memberToDisconnectOnClose);
         d->receiverToDisconnectOnClose = 0;

trunk/src/gui/dialogs/qcolordialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qcolordialog_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qtimer.h>
 #include <qdialogbuttonbox.h>
+#include <qabstracteventdispatcher.h>
 #include <private/qapplication_p.h>
 #include <private/qt_mac_p.h>
 …
 #endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
+@protocol NSWindowDelegate <NSObject>
+- (void)windowDidResize:(NSNotification *)notification;
+- (BOOL)windowShouldClose:(id)window;
+@end
+#endif
 QT_USE_NAMESPACE
 @class QCocoaColorPanelDelegate;
 @interface QCocoaColorPanelDelegate : NSObject {
+@interface QCocoaColorPanelDelegate : NSObject<NSWindowDelegate> {
     NSColorPanel *mColorPanel;
     NSView *mStolenContentView;
 …
     CGFloat mExtraHeight;   // currently unused
     BOOL mHackedPanel;
+    NSInteger mResultCode;
+    BOOL mDialogIsExecuting;
+    BOOL mResultSet;
+}
 - (id)initWithColorPanel:(NSColorPanel *)panel
 …
             cancelButton:(NSButton *)cancelButton
                     priv:(QColorDialogPrivate *)priv;
-- (BOOL)windowShouldClose:(id)window;
-- (void)windowDidResize:(NSNotification *)notification;
 - (void)colorChanged:(NSNotification *)notification;
 - (void)relayout;
 …
 - (QColor)qtColor;
 - (void)finishOffWithCode:(NSInteger)result;
+- (void)cleanUpAfterMyself;
+- (void)showColorPanel;
+- (void)exec;
 @end
 …
     mExtraHeight = 0.0;
     mHackedPanel = (okButton != 0);
+    mResultCode = NSCancelButton;
+    mDialogIsExecuting = false;
+    mResultSet = false;
     if (mHackedPanel) {
 …
+    }
     if (mPriv)
         [[NSNotificationCenter defaultCenter] addObserver:self
                                               selector:@selector(colorChanged:)
                                               name:NSColorPanelColorDidChangeNotification
+                                              object:mColorPanel];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+        selector:@selector(colorChanged:)
+        name:NSColorPanelColorDidChangeNotification
+        object:mColorPanel];
     mQtColor = new QColor();
     return self;
 …
 - (void)dealloc
+{
+    if (mPriv)
+        [[NSNotificationCenter defaultCenter] removeObserver:self];
+    QMacCocoaAutoReleasePool pool;
+    if (mHackedPanel) {
+        NSView *ourContentView = [mColorPanel contentView];
+        // return stolen stuff to its rightful owner
+        [mStolenContentView removeFromSuperview];
+        [mColorPanel setContentView:mStolenContentView];
+        [mOkButton release];
+        [mCancelButton release];
+        [ourContentView release];
+    }
+    [mColorPanel setDelegate:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
     delete mQtColor;
     [super dealloc];
 …
+{
     Q_UNUSED(window);
+    if (mHackedPanel) {
+        [self onCancelClicked];
+    if (!mHackedPanel)
+        [self updateQtColor];
+    if (mDialogIsExecuting) {
+        [self finishOffWithCode:NSCancelButton];
     } else {
         [self updateQtColor];
         [self finishOffWithCode:NSCancelButton];
+        mResultSet = true;
+        mPriv->colorDialog()->reject();
+    }
     return true;
 …
+{
     Q_UNUSED(notification);
+    if (mPriv)
+        [self updateQtColor];
+    [self updateQtColor];
+}
 …
 - (void)onCancelClicked
+{
+    Q_ASSERT(mHackedPanel);
+    [[mStolenContentView window] close];
+    delete mQtColor;
+    mQtColor = new QColor();
+    [self finishOffWithCode:NSCancelButton];
+    if (mHackedPanel) {
+        [[mStolenContentView window] close];
+        delete mQtColor;
+        mQtColor = new QColor();
+        [self finishOffWithCode:NSCancelButton];
+    }
+}
 …
     mQtColor = new QColor();
     NSColor *color = [mColorPanel color];
     NSString *colorSpace = [color colorSpaceName];
     if (colorSpace == NSDeviceCMYKColorSpace) {
         CGFloat cyan, magenta, yellow, black, alpha;
+    NSString *colorSpaceName = [color colorSpaceName];
+    if (colorSpaceName == NSDeviceCMYKColorSpace) {
+        CGFloat cyan = 0, magenta = 0, yellow = 0, black = 0, alpha = 0;
         [color getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha];
         mQtColor->setCmykF(cyan, magenta, yellow, black, alpha);
+    } else {
+        NSColor *tmpColor;
+        if (colorSpace == NSCalibratedRGBColorSpace || colorSpace == NSDeviceRGBColorSpace) {
+            tmpColor = color;
+        } else {
+            tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+        }
+        CGFloat red, green, blue, alpha;
+    } else if (colorSpaceName == NSCalibratedRGBColorSpace || colorSpaceName == NSDeviceRGBColorSpace)  {
+        CGFloat red = 0, green = 0, blue = 0, alpha = 0;
+        [color getRed:&red green:&green blue:&blue alpha:&alpha];
+        mQtColor->setRgbF(red, green, blue, alpha);
+    } else if (colorSpaceName == NSNamedColorSpace) {
+        NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+        CGFloat red = 0, green = 0, blue = 0, alpha = 0;
         [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
         mQtColor->setRgbF(red, green, blue, alpha);
+    }
+    if (mPriv)
+        mPriv->setCurrentQColor(*mQtColor);
+    } else {
+        NSColorSpace *colorSpace = [color colorSpace];
+        if ([colorSpace colorSpaceModel] == NSCMYKColorSpaceModel && [color numberOfComponents] == 5){
+            CGFloat components[5];
+            [color getComponents:components];
+            mQtColor->setCmykF(components[0], components[1], components[2], components[3], components[4]);
+        } else {
+            NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+            CGFloat red = 0, green = 0, blue = 0, alpha = 0;
+            [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha];
+            mQtColor->setRgbF(red, green, blue, alpha);
+        }
+    }
+    mPriv->setCurrentQColor(*mQtColor);
+}
 …
 - (void)finishOffWithCode:(NSInteger)code
+{
+    if (mPriv) {
+        // Finish the QColorDialog as well. But since a call to accept or reject will
+        // close down the QEventLoop found in QDialog, we need to make sure that the
+        // current thread has exited the native dialogs modal session/run loop first.
+        // We ensure this by posting the call:
+    mResultCode = code;
+    if (mDialogIsExecuting) {
+        // We stop the current modal event loop. The control
+        // will then return inside -(void)exec below.
+        // It's important that the modal event loop is stopped before
+        // we accept/reject QColorDialog, since QColorDialog has its
+        // own event loop that needs to be stopped last.
         [NSApp stopModalWithCode:code];
-        if (code == NSOKButton)
-            QMetaObject::invokeMethod(mPriv->colorDialog(), "accept", Qt::QueuedConnection);
-        else
-            QMetaObject::invokeMethod(mPriv->colorDialog(), "reject", Qt::QueuedConnection);
     } else {
+        [NSApp stopModalWithCode:code];
+    }
+}
+- (void)cleanUpAfterMyself
+{
+    if (mHackedPanel) {
+        NSView *ourContentView = [mColorPanel contentView];
+        // return stolen stuff to its rightful owner
+        [mStolenContentView removeFromSuperview];
+        [mColorPanel setContentView:mStolenContentView];
+        [mOkButton release];
+        [mCancelButton release];
+        [ourContentView release];
+    }
+    [mColorPanel setDelegate:nil];
+}
+        // Since we are not in a modal event loop, we can safely close
+        // down QColorDialog
+        // Calling accept() or reject() can in turn call closeCocoaColorPanel.
+        // This check will prevent any such recursion.
+        if (!mResultSet) {
+            mResultSet = true;
+            if (mResultCode == NSCancelButton) {
+                mPriv->colorDialog()->reject();
+            } else {
+                mPriv->colorDialog()->accept();
+            }
+        }
+    }
+}
+- (void)showColorPanel
+{
+    mDialogIsExecuting = false;
+    [mColorPanel makeKeyAndOrderFront:mColorPanel];
+}
+- (void)exec
+{
+    QBoolBlocker nativeDialogOnTop(QApplicationPrivate::native_modal_dialog_active);
+    QMacCocoaAutoReleasePool pool;
+    mDialogIsExecuting = true;
+    bool modalEnded = false;
+    while (!modalEnded) {
+        @try {
+            [NSApp runModalForWindow:mColorPanel];
+            modalEnded = true;
+        } @catch (NSException *) {
+            // For some reason, NSColorPanel throws an exception when
+            // clicking on 'SelectedMenuItemColor' from the 'Developer'
+            // palette (tab three).
+        }
+    }
+    if (mResultCode == NSCancelButton)
+        mPriv->colorDialog()->reject();
+    else
+        mPriv->colorDialog()->accept();
+}
 @end
 …
 extern NSButton *macCreateButton(const char *text, NSView *superview);
+void *QColorDialogPrivate::openCocoaColorPanel(const QColor &initial,
+        QWidget *parent, const QString &title, QColorDialog::ColorDialogOptions options,
+        QColorDialogPrivate *priv)
+void QColorDialogPrivate::openCocoaColorPanel(const QColor &initial,
+        QWidget *parent, const QString &title, QColorDialog::ColorDialogOptions options)
+{
     Q_UNUSED(parent);   // we would use the parent if only NSColorPanel could be a sheet
     QMacCocoaAutoReleasePool pool;
     /*
         The standard Cocoa color panel has no OK or Cancel button and
         is created as a utility window, whereas we want something like
         the Carbon color panel. We need to take the following steps:
+. Intercept the color panel constructor to turn off the
             NSUtilityWindowMask flag. This is done by temporarily
             replacing initWithContentRect:styleMask:backing:defer:
             in NSPanel by our own method.
+. Modify the color panel so that its content view is part
             of a new content view that contains it as well as two
             buttons (OK and Cancel).
+. Lay out the original content view and the buttons when
             the color panel is shown and whenever it is resized.
+. Clean up after ourselves.
     */
+    bool hackColorPanel = !(options & QColorDialog::NoButtons);
+    if (hackColorPanel)
         macStartInterceptNSPanelCtor();
     NSColorPanel *colorPanel = [NSColorPanel sharedColorPanel];
     if (hackColorPanel)
         macStopInterceptNSPanelCtor();
+    [colorPanel setHidesOnDeactivate:false];
+    // set up the Cocoa color panel
     [colorPanel setShowsAlpha:options & QColorDialog::ShowAlphaChannel];
     [colorPanel setTitle:(NSString*)(CFStringRef)QCFString(title)];
+    NSView *stolenContentView = 0;
     NSButton *okButton = 0;
     NSButton *cancelButton = 0;
+    if (hackColorPanel) {
         // steal the color panel's contents view
         stolenContentView = [colorPanel contentView];
         [stolenContentView retain];
         [colorPanel setContentView:0];
+        // create a new content view and add the stolen one as a subview
         NSRect frameRect = { { 0.0, 0.0 }, { 0.0, 0.0 } };
         NSView *ourContentView = [[NSView alloc] initWithFrame:frameRect];
         [ourContentView addSubview:stolenContentView];
+        // create OK and Cancel buttons and add these as subviews
         okButton = macCreateButton("&OK", ourContentView);
         cancelButton = macCreateButton("Cancel", ourContentView);
+        [colorPanel setContentView:ourContentView];
         [colorPanel setDefaultButtonCell:[okButton cell]];
+    }
+    // create a delegate and set it
     QCocoaColorPanelDelegate *delegate =
             [[QCocoaColorPanelDelegate alloc] initWithColorPanel:colorPanel
                                                stolenContentView:stolenContentView
                                                         okButton:okButton
                                                     cancelButton:cancelButton
                                                             priv:priv];
     [colorPanel setDelegate:delegate];
+    setColor(delegate, initial);
     [colorPanel makeKeyAndOrderFront:colorPanel];
+    return delegate;
+}
+void QColorDialogPrivate::closeCocoaColorPanel(void *delegate)
+{
+    QMacCocoaAutoReleasePool pool;
+    QCocoaColorPanelDelegate *theDelegate = static_cast<QCocoaColorPanelDelegate *>(delegate);
+    [[theDelegate colorPanel] close];
+    [theDelegate cleanUpAfterMyself];
     [theDelegate autorelease];
+    if (!delegate) {
+        /*
+           The standard Cocoa color panel has no OK or Cancel button and
+           is created as a utility window, whereas we want something like
+           the Carbon color panel. We need to take the following steps:
+. Intercept the color panel constructor to turn off the
+           NSUtilityWindowMask flag. This is done by temporarily
+           replacing initWithContentRect:styleMask:backing:defer:
+           in NSPanel by our own method.
+. Modify the color panel so that its content view is part
+           of a new content view that contains it as well as two
+           buttons (OK and Cancel).
+. Lay out the original content view and the buttons when
+           the color panel is shown and whenever it is resized.
+. Clean up after ourselves.
+         */
+        bool hackColorPanel = !(options & QColorDialog::NoButtons);
+        if (hackColorPanel)
+            macStartInterceptNSPanelCtor();
+        NSColorPanel *colorPanel = [NSColorPanel sharedColorPanel];
+        if (hackColorPanel)
+            macStopInterceptNSPanelCtor();
+        [colorPanel setHidesOnDeactivate:false];
+        // set up the Cocoa color panel
+        [colorPanel setShowsAlpha:options & QColorDialog::ShowAlphaChannel];
+        [colorPanel setTitle:(NSString*)(CFStringRef)QCFString(title)];
+        NSView *stolenContentView = 0;
+        NSButton *okButton = 0;
+        NSButton *cancelButton = 0;
+        if (hackColorPanel) {
+            // steal the color panel's contents view
+            stolenContentView = [colorPanel contentView];
+            [stolenContentView retain];
+            [colorPanel setContentView:0];
+            // create a new content view and add the stolen one as a subview
+            NSRect frameRect = { { 0.0, 0.0 }, { 0.0, 0.0 } };
+            NSView *ourContentView = [[NSView alloc] initWithFrame:frameRect];
+            [ourContentView addSubview:stolenContentView];
+            // create OK and Cancel buttons and add these as subviews
+            okButton = macCreateButton("&OK", ourContentView);
+            cancelButton = macCreateButton("Cancel", ourContentView);
+            [colorPanel setContentView:ourContentView];
+            [colorPanel setDefaultButtonCell:[okButton cell]];
+        }
+        delegate = [[QCocoaColorPanelDelegate alloc] initWithColorPanel:colorPanel
+            stolenContentView:stolenContentView
+            okButton:okButton
+            cancelButton:cancelButton
+            priv:this];
+        [colorPanel setDelegate:static_cast<QCocoaColorPanelDelegate *>(delegate)];
+    }
+    setCocoaPanelColor(initial);
+    [static_cast<QCocoaColorPanelDelegate *>(delegate) showColorPanel];
+}
+void QColorDialogPrivate::closeCocoaColorPanel()
+{
+    [static_cast<QCocoaColorPanelDelegate *>(delegate) onCancelClicked];
+}
+void QColorDialogPrivate::releaseCocoaColorPanelDelegate()
+{
+    [static_cast<QCocoaColorPanelDelegate *>(delegate) release];
+}
 …
 void QColorDialogPrivate::_q_macRunNativeAppModalPanel()
+{
+    QBoolBlocker nativeDialogOnTop(QApplicationPrivate::native_modal_dialog_active);
+    QMacCocoaAutoReleasePool pool;
+    QCocoaColorPanelDelegate *delegateCasted = static_cast<QCocoaColorPanelDelegate *>(delegate);
+    [NSApp runModalForWindow:[delegateCasted colorPanel]];
+}
+void QColorDialogPrivate::setColor(void *delegate, const QColor &color)
+    [static_cast<QCocoaColorPanelDelegate *>(delegate) exec];
+}
+void QColorDialogPrivate::setCocoaPanelColor(const QColor &color)
+{
     QMacCocoaAutoReleasePool pool;
     QCocoaColorPanelDelegate *theDelegate = static_cast<QCocoaColorPanelDelegate *>(delegate);
+    NSColor *nsColor = [NSColor colorWithCalibratedRed:color.red() / 255.0
+                                                 green:color.green() / 255.0
+                                                  blue:color.blue() / 255.0
+                                                 alpha:color.alpha() / 255.0];
+    NSColor *nsColor;
+    const QColor::Spec spec = color.spec();
+    if (spec == QColor::Cmyk) {
+        nsColor = [NSColor colorWithDeviceCyan:color.cyanF()
+                                       magenta:color.magentaF()
+                                        yellow:color.yellowF()
+                                         black:color.blackF()
+                                         alpha:color.alphaF()];
+    } else {
+        nsColor = [NSColor colorWithCalibratedRed:color.redF()
+                                            green:color.greenF()
+                                             blue:color.blueF()
+                                            alpha:color.alphaF()];
+    }
     [[theDelegate colorPanel] setColor:nsColor];
+}

trunk/src/gui/dialogs/qcolordialog_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QPointer<QObject> receiverToDisconnectOnClose;
     QByteArray memberToDisconnectOnClose;
+    bool nativeDialogInUse;
 #ifdef Q_WS_MAC
+    static void *openCocoaColorPanel(const QColor &initial,
+            QWidget *parent, const QString &title,
+            QColorDialog::ColorDialogOptions options,
+            QColorDialogPrivate *priv = 0);
+    static void closeCocoaColorPanel(void *delegate);
+    static QColor execCocoaColorPanel(const QColor &initial, QWidget *parent,
+            const QString &title, QColorDialog::ColorDialogOptions options);
+    static void setColor(void *delegate, const QColor &color);
+    void openCocoaColorPanel(const QColor &initial,
+            QWidget *parent, const QString &title, QColorDialog::ColorDialogOptions options);
+    void closeCocoaColorPanel();
+    void releaseCocoaColorPanelDelegate();
+    void setCocoaPanelColor(const QColor &color);
     inline void done(int result) { q_func()->done(result); }

trunk/src/gui/dialogs/qdialog.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qaccessible.h"
 #endif
 #if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
 #include "qt_windows.h"
 #include "qmenubar.h"
 …
 #elif defined(Q_WS_X11)
 #  include "../kernel/qt_x11_p.h"
+#elif defined(Q_OS_SYMBIAN)
+#   include "qfiledialog.h"
+#   include "qfontdialog.h"
+#   include "qcolordialog.h"
+#   include "qwizard.h"
+#   include "qmenubar.h"
+#endif
+#if defined(Q_WS_S60)
+#include "private/qt_s60_p.h"
 #endif
 #ifndef SPI_GETSNAPTODEFBUTTON
 #  define SPI_GETSNAPTODEFBUTTON  95
+#   define SPI_GETSNAPTODEFBUTTON  95
 #endif
 …
     \brief The QDialog class is the base class of dialog windows.
     \ingroup dialogs
+    \ingroup dialog-classes
     \ingroup abstractwidgets
+    \mainclass
     A dialog window is a top-level window mostly used for short-term
 …
               f | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : 0))
+{
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (!qt_wince_is_smartphone())
         setWindowFlags(windowFlags() | Qt::WindowOkButtonHint | QFlag(qt_wince_is_mobile() ? 0 : Qt::WindowCancelButtonHint));
 …
     : QWidget(dd, parent, f | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : 0))
+{
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (!qt_wince_is_smartphone())
         setWindowFlags(windowFlags() | Qt::WindowOkButtonHint | QFlag(qt_wince_is_mobile() ? 0 : Qt::WindowCancelButtonHint));
 …
 QDialog::~QDialog()
+{
+    // Need to hide() here, as our (to-be) overridden hide()
+    // will not be called in ~QWidget.
+    hide();
+    QT_TRY {
+        // Need to hide() here, as our (to-be) overridden hide()
+        // will not be called in ~QWidget.
+        hide();
+    } QT_CATCH(...) {
+        // we're in the destructor - just swallow the exception
+    }
+}
 …
+}
 #ifdef Q_OS_WINCE
 #ifdef Q_OS_WINCE_WM
+#if defined(Q_WS_WINCE) || defined(Q_WS_S60)
+#ifdef Q_WS_WINCE_WM
 void QDialogPrivate::_q_doneAction()
+{
 …
+{
     bool result = QWidget::event(e);
+#ifdef Q_WS_WINCE
     if (e->type() == QEvent::OkRequest) {
         accept();
         result = true;
+     }
+#else
+    if ((e->type() == QEvent::StyleChange) || (e->type() == QEvent::Resize ))
+        adjustPosition(parentWidget());
+#endif
     return result;
+}
 …
 //On Windows Mobile we create an empty menu to hide the current menu
 #ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
 #ifndef QT_NO_MENUBAR
     QMenuBar *menuBar = 0;
 …
+    }
 #endif //QT_NO_MENUBAR
+#endif //Q_OS_WINCE_WM
+    show();
+#endif //Q_WS_WINCE_WM
+#ifdef Q_OS_SYMBIAN
+#ifndef QT_NO_MENUBAR
+    QMenuBar *menuBar = 0;
+    if (!findChild<QMenuBar *>())
+        menuBar = new QMenuBar(this);
+#endif
+    if (qobject_cast<QFileDialog *>(this) || qobject_cast<QFontDialog *>(this) ||
+        qobject_cast<QColorDialog *>(this) || qobject_cast<QWizard *>(this))
+        showMaximized();
+    else
+#endif // Q_OS_SYMBIAN
+        show();
 #ifdef Q_WS_MAC
 …
     if (deleteOnClose)
         delete this;
 #ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
 #ifndef QT_NO_MENUBAR
     else if (menuBar)
         delete menuBar;
 #endif //QT_NO_MENUBAR
+#endif //Q_OS_WINCE_WM
+#endif //Q_WS_WINCE_WM
+#ifdef Q_OS_SYMBIAN
+#ifndef QT_NO_MENUBAR
+    else if (menuBar)
+        delete menuBar;
+#endif //QT_NO_MENUBAR
+#endif //Q_OS_SYMBIAN
     return res;
+}
 …
         case Qt::Key_Escape:
             reject();
-            break;
-        case Qt::Key_Up:
-        case Qt::Key_Left:
-            if (focusWidget() &&
-                 (focusWidget()->focusPolicy() == Qt::StrongFocus ||
-                   focusWidget()->focusPolicy() == Qt::WheelFocus)) {
-                e->ignore();
-                break;
+            }
-            // call ours, since c++ blocks us from calling the one
-            // belonging to focusWidget().
-            focusNextPrevChild(false);
-            break;
-        case Qt::Key_Down:
-        case Qt::Key_Right:
-            if (focusWidget() &&
-                 (focusWidget()->focusPolicy() == Qt::StrongFocus ||
-                   focusWidget()->focusPolicy() == Qt::WheelFocus)) {
-                e->ignore();
-                break;
+            }
-            focusNextPrevChild(true);
             break;
         default:
 …
     if (d->mainDef && isActiveWindow()) {
         BOOL snapToDefault = false;
+        if ( QT_WA_INLINE( SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &snapToDefault, 0) ,
+                           SystemParametersInfoA(SPI_GETSNAPTODEFBUTTON, 0, &snapToDefault, 0) )) {
+        if (SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &snapToDefault, 0)) {
             if (snapToDefault)
                 QCursor::setPos(d->mainDef->mapToGlobal(d->mainDef->rect().center()));
 …
     // if the WM advertises that it will place the windows properly for us, let it do it :)
     if (X11->isSupportedByWM(ATOM(_NET_WM_FULL_PLACEMENT)))
+        return;
+#endif
+#ifdef Q_WS_S60
+    if (s60AdjustedPosition())
+        //dialog has already been positioned
         return;
 #endif
 …
+}
+#if defined(Q_WS_S60)
+/*! \internal */
+bool QDialog::s60AdjustedPosition()
+{
+    QPoint p;
+    const QSize mainAreaSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size();
+    const int statusPaneHeight = (S60->screenHeightInPixels - mainAreaSize.height())>>1;
+    const bool doS60Positioning = !(isFullScreen()||isMaximized());
+    if (doS60Positioning) {
+        // naive way to deduce screen orientation
+        if (S60->screenHeightInPixels > S60->screenWidthInPixels) {
+            int cbaHeight;
+            const CEikButtonGroupContainer* bgContainer = S60->buttonGroupContainer();
+            if (!bgContainer) {
+                cbaHeight = 0;
+            } else {
+                cbaHeight = qt_TSize2QSize(bgContainer->Size()).height();
+            }
+            p.setY(S60->screenHeightInPixels-height()-cbaHeight);
+            p.setX(0);
+        } else {
+            const int scrollbarWidth = style()->pixelMetric(QStyle::PM_ScrollBarExtent);
+            TRect cbaRect = TRect();
+            AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EControlPane, cbaRect);
+            AknLayoutUtils::TAknCbaLocation cbaLocation = AknLayoutUtils::CbaLocation();
+            switch (cbaLocation) {
+            case AknLayoutUtils::EAknCbaLocationBottom:
+                p.setY(S60->screenHeightInPixels - height()-cbaRect.Height());
+                p.setX((S60->screenWidthInPixels - width())>>1);
+                break;
+            case AknLayoutUtils::EAknCbaLocationRight:
+                p.setY((S60->screenHeightInPixels - height())>>1);
+                p.setX(qMax(0,S60->screenWidthInPixels-width()-scrollbarWidth-cbaRect.Width()));
+                break;
+            case AknLayoutUtils::EAknCbaLocationLeft:
+                p.setY((S60->screenHeightInPixels - height())>>1);
+                p.setX(qMax(0,scrollbarWidth+cbaRect.Width()));
+                break;
+            }
+        }
+        move(p);
+    }
+    return doS60Positioning;
+}
+#endif
 /*!
 …
                         QWidget::sizeHint().height());
+    }
+#if defined(Q_WS_S60)
+    // if size is not fixed, try to adjust it according to S60 layoutting
+    if (minimumSize() != maximumSize()) {
+        // In S60, dialogs are always the width of screen (in portrait, regardless of current layout)
+        return QSize(qMax(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height());
+    } else {
+        return QWidget::sizeHint();
+    }
+#else
     return QWidget::sizeHint();
+#endif //Q_WS_S60
+}

trunk/src/gui/dialogs/qdialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QDialog(QDialogPrivate &, QWidget *parent, Qt::WindowFlags f = 0);
 #ifdef Q_OS_WINCE
+#if defined(Q_WS_WINCE) || defined(Q_WS_S60)
     bool event(QEvent *e);
 #endif
 …
     bool eventFilter(QObject *, QEvent *);
     void adjustPosition(QWidget*);
 private:
     Q_DECLARE_PRIVATE(QDialog)
     Q_DISABLE_COPY(QDialog)
+#ifdef Q_OS_WINCE_WM
+#if defined(Q_WS_S60)
+    bool s60AdjustedPosition();
+#endif
+#ifdef Q_WS_WINCE_WM
     Q_PRIVATE_SLOT(d_func(), void _q_doneAction())
 #endif

trunk/src/gui/dialogs/qdialog_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     void resetModalitySetByOpen();
 #ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
     void _q_doneAction();
 #endif
 #ifdef Q_WS_MAC
     virtual void mac_nativeDialogModalHelp(){};
+    virtual void mac_nativeDialogModalHelp() {}
 #endif

trunk/src/gui/dialogs/qdialogsbinarycompat_win.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qerrormessage.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <stdlib.h>
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 extern bool qt_wince_is_mobile();    //defined in qguifunctions_wince.cpp
 extern bool qt_wince_is_high_dpi();  //defined in qguifunctions_wince.cpp
 #include "qguifunctions_wince.h"
+#endif
+#if defined(QT_SOFTKEYS_ENABLED)
+#include <qaction.h>
+#ifdef Q_WS_S60
+#include "private/qt_s60_p.h"
+#endif
 #endif
 …
     QTextEdit * errors;
     QLabel * icon;
+#ifdef QT_SOFTKEYS_ENABLED
+    QAction *okAction;
+#endif
     QQueue<QPair<QString, QString> > pending;
     QSet<QString> doNotShow;
 …
 QSize QErrorMessageTextView::minimumSizeHint() const
+{
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (qt_wince_is_mobile())
          if (qt_wince_is_high_dpi())
 …
 QSize QErrorMessageTextView::sizeHint() const
+{
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (qt_wince_is_mobile())
          if (qt_wince_is_high_dpi())
 …
       return QSize(300, 100);
 #else
+#ifdef Q_WS_S60
+    const int smallerDimension = qMin(S60->screenHeightInPixels, S60->screenWidthInPixels);
+    // In S60 layout data, error messages seem to be one third of the screen height (in portrait) minus two.
+    return QSize(smallerDimension, smallerDimension/3-2);
+#else
     return QSize(250, 75);
+#endif
+#endif //Q_WS_S60
+#endif //Q_WS_WINCE
+}
 …
     \brief The QErrorMessage class provides an error message display dialog.
+    \ingroup dialogs
+    \ingroup misc
+    \ingroup standard-dialog
     An error message widget consists of a text label and a checkbox. The
 …
     grid->addWidget(d->again, 1, 1, Qt::AlignTop);
     d->ok = new QPushButton(this);
+#ifdef Q_OS_WINCE
+#ifdef QT_SOFTKEYS_ENABLED
+    d->okAction = new QAction(d->ok);
+    d->okAction->setSoftKeyRole(QAction::PositiveSoftKey);
+    connect(d->okAction, SIGNAL(triggered()), this, SLOT(accept()));
+    addAction(d->okAction);
+#endif
+#if defined(Q_WS_WINCE) || defined(Q_WS_S60)
     d->ok->setFixedSize(0,0);
 #endif
 …
         qtMessageHandler = new QErrorMessage(0);
         qAddPostRoutine(deleteStaticcQErrorMessage); // clean up
         qtMessageHandler->setWindowTitle(qApp->applicationName());
+        qtMessageHandler->setWindowTitle(QApplication::applicationName());
         qInstallMsgHandler(jump);
+    }
 …
+}
 /*!
     \reimp
 …
     again->setText(QErrorMessage::tr("&Show this message again"));
     ok->setText(QErrorMessage::tr("&OK"));
+#ifdef QT_SOFTKEYS_ENABLED
+    okAction->setText(ok->text());
+#endif
+}

trunk/src/gui/dialogs/qerrormessage.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qfiledialog.cpp

-              r172
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qapplication.h>
 #include <qstylepainter.h>
 #ifndef Q_OS_WINCE
+#if !defined(Q_WS_WINCE) && !defined(Q_OS_SYMBIAN)
 #include "ui_qfiledialog.h"
 #else
+#include "ui_qfiledialog_wince.h"
+#define Q_EMBEDDED_SMALLSCREEN
+#include "ui_qfiledialog_embedded.h"
+#if defined(Q_OS_WINCE)
 extern bool qt_priv_ptr_valid;
+#endif
 #endif
 …
   \class QFileDialog
   \brief The QFileDialog class provides a dialog that allow users to select files or directories.
   \ingroup dialogs
+  \mainclass
+  \ingroup standard-dialogs
   The QFileDialog class enables a user to traverse the file system in
 …
   The easiest way to create a QFileDialog is to use the static
+  functions. On Windows, these static functions will call the native
+  Windows file dialog, and on Mac OS X these static function will call
+  the native Mac OS X file dialog.
+  functions. On Windows, Mac OS X, KDE and GNOME, these static functions will
+  call the native file dialog when possible.
   \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 0
 …
     \enum QFileDialog::Option
+    \value ShowDirsOnly Only show directories in the file dialog. By default both files and
+    directories are shown. (Valid only in the \l Directory file mode.)
+    \value DontResolveSymlinks Don't resolve symlinks in the file dialog. By default symlinks
+    are resolved.
+    \value DontConfirmOverwrite Don't ask for confirmation if an existing file is selected.
+    By default confirmation is requested.
+    \value DontUseNativeDialog Don't use the native file dialog. By default on Mac OS X and Windows,
+    the native file dialog is used unless you use a subclass of QFileDialog that contains the
+    Q_OBJECT macro.
+    \value ShowDirsOnly Only show directories in the file dialog. By
+    default both files and directories are shown. (Valid only in the
+    \l Directory file mode.)
+    \value DontResolveSymlinks Don't resolve symlinks in the file
+    dialog. By default symlinks are resolved.
+    \value DontConfirmOverwrite Don't ask for confirmation if an
+    existing file is selected.  By default confirmation is requested.
+    \value DontUseNativeDialog Don't use the native file dialog. By
+    default, the native file dialog is used unless you use a subclass
+    of QFileDialog that contains the Q_OBJECT macro.
     \value ReadOnly Indicates that the model is readonly.
     \value HideNameFilterDetails Indicates if the is hidden or not.
     This value is obsolete and does nothing since Qt 4.5:
     \value DontUseSheet In previous versions of Qt, the static functions would
     create a sheet by default if the static function was given a parent. This
     is no longer supported in Qt 4.5, The static functions will always be an
     application modal dialog. If you want to use sheets, use
     QFileDialog::open() instead.
+    \value DontUseSheet In previous versions of Qt, the static
+    functions would create a sheet by default if the static function
+    was given a parent. This is no longer supported in Qt 4.5, The
+    static functions will always be an application modal dialog. If
+    you want to use sheets, use QFileDialog::open() instead.
 */
 …
     Q_D(QFileDialog);
     d->init();
+    d->lineEdit()->selectAll();
+}
 …
     Q_D(QFileDialog);
     d->init(directory, filter, caption);
+    d->lineEdit()->selectAll();
+}
 …
     settings.setValue(QLatin1String("filedialog"), saveState());
 #endif
-    delete d->qFileDialogUi;
     d->deleteNativeDialog_sys();
+}
 …
 static const qint32 QFileDialogMagic = 0xbe;
+const char *qt_file_dialog_filter_reg_exp =
+"^(.*)\\(([a-zA-Z0-9_.*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$";
 /*!
 …
+}
+QFileDialogPrivate::QFileDialogPrivate()
+    :
+#ifndef QT_NO_PROXYMODEL
+        proxyModel(0),
+#endif
+        model(0),
+        fileMode(QFileDialog::AnyFile),
+        acceptMode(QFileDialog::AcceptOpen),
+        currentHistoryLocation(-1),
+        renameAction(0),
+        deleteAction(0),
+        showHiddenAction(0),
+        useDefaultCaption(true),
+        defaultFileTypes(true),
+        fileNameLabelExplicitlySat(false),
+        nativeDialogInUse(false),
+#ifdef Q_WS_MAC
+        mDelegate(0),
+#ifndef QT_MAC_USE_COCOA
+        mDialog(0),
+        mDialogStarted(false),
+        mDialogClosed(true),
+#endif
+#endif
+        qFileDialogUi(0)
+{
+}
+QFileDialogPrivate::~QFileDialogPrivate()
+{
+}
 void QFileDialogPrivate::retranslateWindowTitle()
+{
 …
 /*!
+    Sets the given \a option to be enabled if \a on is true;
+    otherwise, clears the given \a option.
+    \since 4.5
+    Sets the given \a option to be enabled if \a on is true; otherwise,
+    clears the given \a option.
     \sa options, testOption()
 …
     \since 4.5
+    Opens the dialog and connects its accepted() signal to the slot specified
+    by \a receiver and \a member.
+    This function connects one of its signals to the slot specified by \a receiver
+    and \a member. The specific signal depends is filesSelected() if fileMode is
+    ExistingFiles and fileSelected() if fileMode is anything else.
     The signal will be disconnected from the slot when the dialog is closed.
 …
+{
     Q_D(QFileDialog);
     const char *signal = (fileMode() == ExistingFiles) ? SIGNAL(filesSelected(const QStringList&))
                                                        : SIGNAL(fileSelected(const QString&));
+    const char *signal = (fileMode() == ExistingFiles) ? SIGNAL(filesSelected(QStringList))
+                                                       : SIGNAL(fileSelected(QString));
     connect(this, signal, receiver, member);
     d->signalToDisconnectOnClose = signal;
 …
 void QFileDialogPrivate::_q_goToUrl(const QUrl &url)
+{
+    QModelIndex idx = model->index(url.toLocalFile());
+    //The shortcut in the side bar may have a parent that is not fetched yet (e.g. an hidden file)
+    //so we force the fetching
+    QFileSystemModelPrivate::QFileSystemNode *node = model->d_func()->node(url.toLocalFile(), true);
+    QModelIndex idx =  model->d_func()->index(node);
     _q_enterDirectory(idx);
+}
 …
     d->qFileDialogUi->newFolderButton->setEnabled(d->model->flags(root) & Qt::ItemIsDropEnabled);
     if (root != d->rootIndex()) {
 #ifndef QT_NO_COMPLETER
+#ifndef QT_NO_FSCOMPLETER
     if (directory.endsWith(QLatin1Char('/')))
         d->completer->setCompletionPrefix(newDirectory);
 …
     QModelIndex index = d->model->index(filename);
+    QString file;
     if (!index.isValid()) {
         // save as dialog where we want to input a default value
 …
                 text = text.remove(0,1);
+        }
+        if (!isVisible() || !d->lineEdit()->hasFocus())
+            d->lineEdit()->setText(text);
+        file = text;
     } else {
+        d->qFileDialogUi->listView->selectionModel()->clear();
+        if (!isVisible() || !d->lineEdit()->hasFocus())
+            d->lineEdit()->setText(index.data().toString());
+    }
+        file = index.data().toString();
+    }
+    d->qFileDialogUi->listView->selectionModel()->clear();
+    if (!isVisible() || !d->lineEdit()->hasFocus())
+        d->lineEdit()->setText(file);
+}
 …
             // and on Windows it already ends with slash.
             QString path = rootPath();
             if (!path.endsWith(QLatin1String("/")))
                 path += QLatin1String("/");
+            if (!path.endsWith(QLatin1Char('/')))
+                path += QLatin1Char('/');
             path += name;
             files.append(path);
 …
     Q_D(QFileDialog);
     d->defaultFileTypes = (filters == QStringList(QFileDialog::tr("All Files (*)")));
+    d->nameFilters = filters;
+    QStringList cleanedFilters;
+    for (int i = 0; i < filters.count(); ++i) {
+        cleanedFilters << filters[i].simplified();
+    }
+    d->nameFilters = cleanedFilters;
     if (d->nativeDialogInUse){
         d->setNameFilters_sys(filters);
+        d->setNameFilters_sys(cleanedFilters);
         return;
+    }
     d->qFileDialogUi->fileTypeCombo->clear();
     if (filters.isEmpty())
+    if (cleanedFilters.isEmpty())
         return;
     if (testOption(HideNameFilterDetails)) {
         QStringList strippedFilters;
+        for (int i = 0; i < filters.count(); ++i) {
+            strippedFilters.append(filters[i].mid(0, filters[i].indexOf(QLatin1String(" ("))));
+        QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
+        for (int i = 0; i < cleanedFilters.count(); ++i) {
+            QString filterName;
+            int index = r.indexIn(cleanedFilters[i]);
+            if (index >= 0)
+                filterName = r.cap(1);
+            strippedFilters.append(filterName.simplified());
+        }
         d->qFileDialogUi->fileTypeCombo->addItems(strippedFilters);
     } else {
         d->qFileDialogUi->fileTypeCombo->addItems(filters);
+        d->qFileDialogUi->fileTypeCombo->addItems(cleanedFilters);
+    }
     d->_q_useNameFilter(0);
 …
     Q_D(QFileDialog);
     d->model->setIconProvider(provider);
+    //It forces the refresh of all entries in the side bar, then we can get new icons
+    d->qFileDialogUi->sidebar->setUrls(d->qFileDialogUi->sidebar->urls());
+}
 …
 /*!
+  This is a convenience static function that returns an existing file
+  selected by the user. If the user presses Cancel, it returns a null
+  string.
+  \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 8
+  The function creates a modal file dialog with the given \a parent widget.
+  If the parent is not 0, the dialog will be shown centered over the
+  parent widget.
+  The file dialog's working directory will be set to \a dir.  If \a
+  dir includes a file name, the file will be selected. Only files
+  that match the given \a filter are shown. The filter selected is
+  set to \a selectedFilter. The parameters \a dir, \a
+  selectedFilter, and \a filter may be empty strings. If you want
+  multiple filters, separate them with ';;', for example:
+  \code
+    This is a convenience static function that returns an existing file
+    selected by the user. If the user presses Cancel, it returns a null string.
+    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 8
+    The function creates a modal file dialog with the given \a parent widget.
+    If \a parent is not 0, the dialog will be shown centered over the parent
+    widget.
+    The file dialog's working directory will be set to \a dir. If \a dir
+    includes a file name, the file will be selected. Only files that match the
+    given \a filter are shown. The filter selected is set to \a selectedFilter.
+    The parameters \a dir, \a selectedFilter, and \a filter may be empty
+    strings. If you want multiple filters, separate them with ';;', for
+    example:
+    \code
     "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
   \endcode
   The \a options argument holds various
   options about how to run the dialog, see the QFileDialog::Option enum for
   more information on the flags you can pass.
   The dialog's caption is set to \a caption. If \a caption is not
   specified then a default caption will be used.
   Under Windows and Mac OS X, this static function will use the native
   file dialog and not a QFileDialog.
   Note that on Windows the dialog will spin a blocking modal event loop
   that will not dispatch any QTimers, and if parent is not 0 then it will
   position the dialog just under the parent's title bar.
   Under Unix/X11, the normal behavior of the file dialog is to resolve
   and follow symlinks. For example, if \c{/usr/tmp} is a symlink to
   \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after
   entering \c{/usr/tmp}. If \a options includes DontResolveSymlinks,
   the file dialog will treat symlinks as regular directories.
   \warning Do not delete \a parent during the execution of the dialog.
            If you want to do this, you should create the dialog
            yourself using one of the QFileDialog constructors.
   \sa getOpenFileNames(), getSaveFileName(), getExistingDirectory()
+    \endcode
+    The \a options argument holds various options about how to run the dialog,
+    see the QFileDialog::Option enum for more information on the flags you can
+    pass.
+    The dialog's caption is set to \a caption. If \a caption is not specified
+    then a default caption will be used.
+    On Windows and Mac OS X, this static function will use the native file
+    dialog and not a QFileDialog.
+    On Windows the dialog will spin a blocking modal event loop that will not
+    dispatch any QTimers, and if \a parent is not 0 then it will position the
+    dialog just below the parent's title bar.
+    On Unix/X11, the normal behavior of the file dialog is to resolve and
+    follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp},
+    the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If
+    \a options includes DontResolveSymlinks, the file dialog will treat
+    symlinks as regular directories.
+    \warning Do not delete \a parent during the execution of the dialog. If you
+    want to do this, you should create the dialog yourself using one of the
+    QFileDialog constructors.
+    \sa getOpenFileNames(), getSaveFileName(), getExistingDirectory()
 */
 QString QFileDialog::getOpenFileName(QWidget *parent,
 …
 /*!
   This is a convenience static function that will return one or more
   existing files selected by the user.
   \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 9
   This function creates a modal file dialog with the given \a parent
   widget. If the parent is not 0, the dialog will be shown centered
   over the parent widget.
   The file dialog's working directory will be set to \a dir. If \a
   dir includes a file name, the file will be selected. The filter
   is set to \a filter so that only those files which match the filter
   are shown. The filter selected is set to \a selectedFilter. The parameters
   \a dir, \a selectedFilter and \a filter may be empty strings. If you
   need multiple filters, separate them with ';;', for instance:
   \code
+    This is a convenience static function that will return one or more existing
+    files selected by the user.
+    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 9
+    This function creates a modal file dialog with the given \a parent widget.
+    If \a parent is not 0, the dialog will be shown centered over the parent
+    widget.
+    The file dialog's working directory will be set to \a dir. If \a dir
+    includes a file name, the file will be selected. The filter is set to
+    \a filter so that only those files which match the filter are shown. The
+    filter selected is set to \a selectedFilter. The parameters \a dir,
+    \a selectedFilter and \a filter may be empty strings. If you need multiple
+    filters, separate them with ';;', for instance:
+    \code
     "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
+  \endcode
+  The dialog's caption is set to \a caption. If \a caption is not
+  specified then a default caption will be used.
+  Under Windows and Mac OS X, this static function will use the native
+  file dialog and not a QFileDialog. On Mac OS X, the \a dir argument
+  is ignored, the native dialog always displays the last visited directory.
+  Note that on Windows the dialog will spin a blocking modal event loop
+  that will not dispatch any QTimers, and if parent is not 0 then it will
+  position the dialog just under the parent's title bar.
+  Under Unix/X11, the normal behavior of the file dialog is to resolve
+  and follow symlinks. For example, if \c{/usr/tmp} is a symlink to
+  \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after
+  entering \c{/usr/tmp}. The \a options argument holds various
+  options about how to run the dialog, see the QFileDialog::Option enum for
+  more information on the flags you can pass.
+  Note that if you want to iterate over the list of files, you should
+  iterate over a copy. For example:
+    \endcode
+    The dialog's caption is set to \a caption. If \a caption is not specified
+    then a default caption will be used.
+    On Windows and Mac OS X, this static function will use the native file
+    dialog and not a QFileDialog.
+    On Windows the dialog will spin a blocking modal event loop that will not
+    dispatch any QTimers, and if \a parent is not 0 then it will position the
+    dialog just below the parent's title bar.
+    On Unix/X11, the normal behavior of the file dialog is to resolve and
+    follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp},
+    the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}.
+    The \a options argument holds various options about how to run the dialog,
+    see the QFileDialog::Option enum for more information on the flags you can
+    pass.
+    \note If you want to iterate over the list of files, you should iterate
+    over a copy. For example:
     \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 10
   \warning Do not delete \a parent during the execution of the dialog.
            If you want to do this, you should create the dialog
            yourself using one of the QFileDialog constructors.
   \sa getOpenFileName(), getSaveFileName(), getExistingDirectory()
+    \warning Do not delete \a parent during the execution of the dialog. If you
+    want to do this, you should create the dialog yourself using one of the
+    QFileDialog constructors.
+    \sa getOpenFileName(), getSaveFileName(), getExistingDirectory()
 */
 QStringList QFileDialog::getOpenFileNames(QWidget *parent,
 …
                                           Options options)
+{
     if (qt_filedialog_open_filenames_hook)
+    if (qt_filedialog_open_filenames_hook && !(options & DontUseNativeDialog))
         return qt_filedialog_open_filenames_hook(parent, caption, dir, filter, selectedFilter, options);
     QFileDialogArgs args;
 …
 /*!
+  This is a convenience static function that will return a file name
+  selected by the user. The file does not have to exist.
+  It creates a modal file dialog with the given \a parent widget. If the
+  parent is not 0, the dialog will be shown centered over the parent
+  widget.
+  \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 11
+  The file dialog's working directory will be set to \a dir. If \a
+  dir includes a file name, the file will be selected. Only files that
+  match the \a filter are shown. The filter selected is set to
+  \a selectedFilter. The parameters \a dir, \a selectedFilter, and
+  \a filter may be empty strings. Multiple filters are separated with ';;'.
+  For instance:
+  \code
+    This is a convenience static function that will return a file name selected
+    by the user. The file does not have to exist.
+    It creates a modal file dialog with the given \a parent widget. If
+    \a parent is not 0, the dialog will be shown centered over the parent
+    widget.
+    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 11
+    The file dialog's working directory will be set to \a dir. If \a dir
+    includes a file name, the file will be selected. Only files that match the
+    \a filter are shown. The filter selected is set to \a selectedFilter. The
+    parameters \a dir, \a selectedFilter, and \a filter may be empty strings.
+    Multiple filters are separated with ';;'. For instance:
+    \code
     "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
+  \endcode
+  The \a options argument holds various
+  options about how to run the dialog, see the QFileDialog::Option enum for
+  more information on the flags you can pass.
+  The default filter can be chosen by setting \a selectedFilter to the desired value.
+  The dialog's caption is set to \a caption. If \a caption is not
+  specified then a default caption will be used.
+  Under Windows and Mac OS X, this static function will use the native
+  file dialog and not a QFileDialog.
+  Note that on Windows the dialog will spin a blocking modal event loop
+  that will not dispatch any QTimers, and if parent is not 0 then it will
+  position the dialog just under the parent's title bar.
+  On Mac OS X, the filter argument is ignored.
+  Under Unix/X11, the normal behavior of the file dialog is to resolve
+  and follow symlinks. For example, if \c{/usr/tmp} is a symlink to
+  \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after
+  entering \c{/usr/tmp}. If \a options includes DontResolveSymlinks,
+  the file dialog will treat symlinks as regular directories.
+  \warning Do not delete \a parent during the execution of the dialog.
+           If you want to do this, you should create the dialog
+           yourself using one of the QFileDialog constructors.
+  \sa getOpenFileName(), getOpenFileNames(), getExistingDirectory()
+    \endcode
+    The \a options argument holds various options about how to run the dialog,
+    see the QFileDialog::Option enum for more information on the flags you can
+    pass.
+    The default filter can be chosen by setting \a selectedFilter to the
+    desired value.
+    The dialog's caption is set to \a caption. If \a caption is not specified,
+    a default caption will be used.
+    On Windows and Mac OS X, this static function will use the native file
+    dialog and not a QFileDialog.
+    On Windows the dialog will spin a blocking modal event loop that will not
+    dispatch any QTimers, and if \a parent is not 0 then it will position the
+    dialog just below the parent's title bar. On Mac OS X, with its native file
+    dialog, the filter argument is ignored.
+    On Unix/X11, the normal behavior of the file dialog is to resolve and
+    follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp},
+    the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If
+    \a options includes DontResolveSymlinks the file dialog will treat symlinks
+    as regular directories.
+    \warning Do not delete \a parent during the execution of the dialog. If you
+    want to do this, you should create the dialog yourself using one of the
+    QFileDialog constructors.
+    \sa getOpenFileName(), getOpenFileNames(), getExistingDirectory()
 */
 QString QFileDialog::getSaveFileName(QWidget *parent,
 …
                                      Options options)
+{
     if (qt_filedialog_save_filename_hook)
+    if (qt_filedialog_save_filename_hook && !(options & DontUseNativeDialog))
         return qt_filedialog_save_filename_hook(parent, caption, dir, filter, selectedFilter, options);
     QFileDialogArgs args;
 …
 /*!
+  This is a convenience static function that will return an existing
+  directory selected by the user.
+  \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 12
+  This function creates a modal file dialog with the given \a parent
+  widget. If the parent is not 0, the dialog will be shown centered over
+  the parent widget.
+  The dialog's working directory is set to \a dir, and the caption is
+  set to \a caption. Either of these may be an empty string in which case
+  the current directory and a default caption will be used
+  respectively.
+  The \a options argument holds various
+  options about how to run the dialog, see the QFileDialog::Option enum for
+  more information on the flags you can pass. Note that \l{QFileDialog::}{ShowDirsOnly}
+  must be set to ensure a native file dialog.
+  Under Windows and Mac OS X, this static function will use the native
+  file dialog and not a QFileDialog. On Mac OS X, the \a dir argument
+  is ignored, the native dialog always displays the last visited directory.
+  On Windows CE, if the device has no native file dialog, a QFileDialog
+  will be used.
+  Under Unix/X11, the normal behavior of the file dialog is to resolve
+  and follow symlinks. For example, if \c{/usr/tmp} is a symlink to
+  \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after
+  entering \c{/usr/tmp}. If \a options includes DontResolveSymlinks,
+  the file dialog will treat symlinks as regular directories.
+  Note that on Windows the dialog will spin a blocking modal event loop
+  that will not dispatch any QTimers, and if parent is not 0 then it will
+  position the dialog just under the parent's title bar.
+  \warning Do not delete \a parent during the execution of the dialog.
+           If you want to do this, you should create the dialog
+           yourself using one of the QFileDialog constructors.
+  \sa getOpenFileName(), getOpenFileNames(), getSaveFileName()
+    This is a convenience static function that will return an existing
+    directory selected by the user.
+    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 12
+    This function creates a modal file dialog with the given \a parent widget.
+    If \a parent is not 0, the dialog will be shown centered over the parent
+    widget.
+    The dialog's working directory is set to \a dir, and the caption is set to
+    \a caption. Either of these may be an empty string in which case the
+    current directory and a default caption will be used respectively.
+    The \a options argument holds various options about how to run the dialog,
+    see the QFileDialog::Option enum for more information on the flags you can
+    pass. To ensure a native file dialog, \l{QFileDialog::}{ShowDirsOnly} must
+    be set.
+    On Windows and Mac OS X, this static function will use the native file
+    dialog and not a QFileDialog. On Windows CE, if the device has no native
+    file dialog, a QFileDialog will be used.
+    On Unix/X11, the normal behavior of the file dialog is to resolve and
+    follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp},
+    the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If
+    \a options includes DontResolveSymlinks, the file dialog will treat
+    symlinks as regular directories.
+    On Windows the dialog will spin a blocking modal event loop that will not
+    dispatch any QTimers, and if \a parent is not 0 then it will position the
+    dialog just below the parent's title bar.
+    \warning Do not delete \a parent during the execution of the dialog. If you
+    want to do this, you should create the dialog yourself using one of the
+    QFileDialog constructors.
+    \sa getOpenFileName(), getOpenFileNames(), getSaveFileName()
 */
 QString QFileDialog::getExistingDirectory(QWidget *parent,
 …
                                           Options options)
+{
     if (qt_filedialog_existing_directory_hook)
+    if (qt_filedialog_existing_directory_hook && !(options & DontUseNativeDialog))
         return qt_filedialog_existing_directory_hook(parent, caption, dir, options);
     QFileDialogArgs args;
 …
 #if defined(Q_WS_WIN)
     if (qt_use_native_dialogs && !(args.options & DontUseNativeDialog) && (options & ShowDirsOnly)
 #if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
         && qt_priv_ptr_valid
 #endif
 …
 #endif
 #ifdef Q_OS_WINCE
+#if defined(Q_EMBEDDED_SMALLSCREEN)
     qFileDialogUi->lookInLabel->setVisible(false);
     qFileDialogUi->fileNameLabel->setVisible(false);
 …
     model->setNameFilterDisables(false);
 #endif
+    QFileDialog::connect(model, SIGNAL(fileRenamed(const QString &, const QString &, const QString &)), q, SLOT(_q_fileRenamed(const QString &, const QString &, const QString &)));
+    QFileDialog::connect(model, SIGNAL(rootPathChanged(const QString &)),
+            q, SLOT(_q_pathChanged(const QString &)));
+    QFileDialog::connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+            q, SLOT(_q_rowsInserted(const QModelIndex &)));
+    model->d_func()->disableRecursiveSort = true;
+    QFileDialog::connect(model, SIGNAL(fileRenamed(QString,QString,QString)), q, SLOT(_q_fileRenamed(QString,QString,QString)));
+    QFileDialog::connect(model, SIGNAL(rootPathChanged(QString)),
+            q, SLOT(_q_pathChanged(QString)));
+    QFileDialog::connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            q, SLOT(_q_rowsInserted(QModelIndex)));
     model->setReadOnly(false);
     qFileDialogUi = new Ui_QFileDialog();
+    qFileDialogUi.reset(new Ui_QFileDialog());
     qFileDialogUi->setupUi(q);
 …
                      << QUrl::fromLocalFile(QDir::homePath());
     qFileDialogUi->sidebar->init(model, initialBookmarks);
     QFileDialog::connect(qFileDialogUi->sidebar, SIGNAL(goToUrl(const QUrl &)),
                          q, SLOT(_q_goToUrl(const QUrl &)));
+    QFileDialog::connect(qFileDialogUi->sidebar, SIGNAL(goToUrl(QUrl)),
+                         q, SLOT(_q_goToUrl(QUrl)));
     QObject::connect(qFileDialogUi->buttonBox, SIGNAL(accepted()), q, SLOT(accept()));
 …
     qFileDialogUi->fileNameLabel->setBuddy(qFileDialogUi->fileNameEdit);
 #endif
 #ifndef QT_NO_COMPLETER
     completer = new QFSCompletor(model, q);
+#ifndef QT_NO_FSCOMPLETER
+    completer = new QFSCompleter(model, q);
     qFileDialogUi->fileNameEdit->setCompleter(completer);
-    completer->sourceModel = model;
     QObject::connect(qFileDialogUi->fileNameEdit, SIGNAL(textChanged(QString)),
             q, SLOT(_q_autoCompleteFileName(QString)));
 #endif // QT_NO_COMPLETER
+#endif // QT_NO_FSCOMPLETER
     QObject::connect(qFileDialogUi->fileNameEdit, SIGNAL(textChanged(QString)),
                      q, SLOT(_q_updateOkButton()));
 …
     QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(activated(int)),
                      q, SLOT(_q_useNameFilter(int)));
     QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(activated(const QString &)),
                      q, SIGNAL(filterSelected(const QString &)));
+    QObject::connect(qFileDialogUi->fileTypeCombo, SIGNAL(activated(QString)),
+                     q, SIGNAL(filterSelected(QString)));
     qFileDialogUi->listView->init(this);
 …
     QActionGroup *showActionGroup = new QActionGroup(q);
     showActionGroup->setExclusive(false);
     QObject::connect(showActionGroup, SIGNAL(triggered(QAction *)),
                      q, SLOT(_q_showHeader(QAction *)));;
+    QObject::connect(showActionGroup, SIGNAL(triggered(QAction*)),
+                     q, SLOT(_q_showHeader(QAction*)));;
     QAbstractItemModel *abstractModel = model;
 …
+    }
     QItemSelectionModel *selModel = qFileDialogUi->treeView->selectionModel();
+    QScopedPointer<QItemSelectionModel> selModel(qFileDialogUi->treeView->selectionModel());
     qFileDialogUi->treeView->setSelectionModel(qFileDialogUi->listView->selectionModel());
+    delete selModel;
     QObject::connect(qFileDialogUi->treeView, SIGNAL(activated(QModelIndex)),
                      q, SLOT(_q_enterDirectory(QModelIndex)));
 …
     // Selections
     QItemSelectionModel *selections = qFileDialogUi->listView->selectionModel();
     QObject::connect(selections, SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
+    QObject::connect(selections, SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
                      q, SLOT(_q_selectionChanged()));
     QObject::connect(selections, SIGNAL(currentChanged(QModelIndex,QModelIndex)),
 …
     QModelIndex idx = d->rootIndex();
     if (d->proxyModel) {
         disconnect(d->proxyModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
             this, SLOT(_q_rowsInserted(const QModelIndex &)));
+        disconnect(d->proxyModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(_q_rowsInserted(QModelIndex)));
     } else {
         disconnect(d->model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
             this, SLOT(_q_rowsInserted(const QModelIndex &)));
+        disconnect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(_q_rowsInserted(QModelIndex)));
+    }
 …
         d->qFileDialogUi->listView->setModel(d->proxyModel);
         d->qFileDialogUi->treeView->setModel(d->proxyModel);
 #ifndef QT_NO_COMPLETER
+#ifndef QT_NO_FSCOMPLETER
         d->completer->setModel(d->proxyModel);
         d->completer->proxyModel = d->proxyModel;
 #endif
         connect(d->proxyModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
             this, SLOT(_q_rowsInserted(const QModelIndex &)));
+        connect(d->proxyModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(_q_rowsInserted(QModelIndex)));
     } else {
         d->proxyModel = 0;
         d->qFileDialogUi->listView->setModel(d->model);
         d->qFileDialogUi->treeView->setModel(d->model);
 #ifndef QT_NO_COMPLETER
+#ifndef QT_NO_FSCOMPLETER
         d->completer->setModel(d->model);
         d->completer->sourceModel = d->model;
         d->completer->proxyModel = 0;
 #endif
         connect(d->model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
             this, SLOT(_q_rowsInserted(const QModelIndex &)));
+    }
     QItemSelectionModel *selModel = d->qFileDialogUi->treeView->selectionModel();
+        connect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(_q_rowsInserted(QModelIndex)));
+    }
+    QScopedPointer<QItemSelectionModel> selModel(d->qFileDialogUi->treeView->selectionModel());
     d->qFileDialogUi->treeView->setSelectionModel(d->qFileDialogUi->listView->selectionModel());
+    delete selModel;
     d->setRootIndex(idx);
     // reconnect selection
     QItemSelectionModel *selections = d->qFileDialogUi->listView->selectionModel();
     QObject::connect(selections, SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
+    QObject::connect(selections, SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
                      this, SLOT(_q_selectionChanged()));
     QObject::connect(selections, SIGNAL(currentChanged(QModelIndex,QModelIndex)),
 …
 void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text)
+{
     if (text.startsWith(QLatin1String("//")) || text.startsWith(QLatin1String("\\"))) {
+    if (text.startsWith(QLatin1String("//")) || text.startsWith(QLatin1Char('\\'))) {
         qFileDialogUi->listView->selectionModel()->clearSelection();
         return;
 …
     QString lineEditText = lineEdit()->text();
     if (lineEditText.startsWith(QLatin1String("//")) || lineEditText.startsWith(QLatin1String("\\"))) {
+    if (lineEditText.startsWith(QLatin1String("//")) || lineEditText.startsWith(QLatin1Char('\\'))) {
         button->setEnabled(true);
         if (acceptMode == QFileDialog::AcceptSave)
             button->setText(isOpenDirectory ? QFileDialog::tr("&Open") : acceptLabel);
+            button->setText(acceptLabel);
         return;
+    }
 …
     Q_Q(QFileDialog);
     // My Computer or a directory
     QModelIndex sourceIndex = mapToSource(index);
+    QModelIndex sourceIndex = index.model() == proxyModel ? mapToSource(index) : index;
     QString path = sourceIndex.data(QFileSystemModel::FilePathRole).toString();
     if (path.isEmpty() || model->isDir(sourceIndex)) {
 …
+}
-const char *qt_file_dialog_filter_reg_exp =
-    "^([^()]*)\\(([a-zA-Z0-9_.*? +;#\\-\\[\\]@\\{\\}/!<>\\$%&=^~:\\|]*)\\)$";
 // Makes a list of filters from a normal filter string "Image Files (*.png *.jpg)"
 QStringList qt_clean_filter_list(const QString &filter)
 …
 void QFileDialogListView::keyPressEvent(QKeyEvent *e)
+{
+    if (!d_ptr->itemViewKeyboardEvent(e)) {
+#ifdef QT_KEYPAD_NAVIGATION
+    if (QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional) {
         QListView::keyPressEvent(e);
+    }
+        return;
+    }
+#endif // QT_KEYPAD_NAVIGATION
+    if (!d_ptr->itemViewKeyboardEvent(e))
+        QListView::keyPressEvent(e);
     e->accept();
+}
 …
 void QFileDialogTreeView::keyPressEvent(QKeyEvent *e)
+{
+    if (!d_ptr->itemViewKeyboardEvent(e)) {
+#ifdef QT_KEYPAD_NAVIGATION
+    if (QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional) {
         QTreeView::keyPressEvent(e);
+    }
+        return;
+    }
+#endif // QT_KEYPAD_NAVIGATION
+    if (!d_ptr->itemViewKeyboardEvent(e))
+        QTreeView::keyPressEvent(e);
     e->accept();
+}
 …
 void QFileDialogLineEdit::keyPressEvent(QKeyEvent *e)
+{
+#ifdef QT_KEYPAD_NAVIGATION
+    if (QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional) {
+        QLineEdit::keyPressEvent(e);
+        return;
+    }
+#endif // QT_KEYPAD_NAVIGATION
     int key = e->key();
     QLineEdit::keyPressEvent(e);
 …
+}
 #ifndef QT_NO_COMPLETER
 QString QFSCompletor::pathFromIndex(const QModelIndex &index) const
+#ifndef QT_NO_FSCOMPLETER
+QString QFSCompleter::pathFromIndex(const QModelIndex &index) const
+{
     const QFileSystemModel *dirModel;
 …
+}
 QStringList QFSCompletor::splitPath(const QString &path) const
+QStringList QFSCompleter::splitPath(const QString &path) const
+{
     if (path.isEmpty())
 …
     QString pathCopy = QDir::toNativeSeparators(path);
     QString sep = QDir::separator();
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#if defined(Q_OS_SYMBIAN)
+    if (pathCopy == QLatin1String("\\"))
+        return QStringList(pathCopy);
+#elif defined(Q_OS_WIN) || defined(Q_OS_OS2)
     if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\"))
         return QStringList(pathCopy);
 …
 #endif
+    QRegExp re(QLatin1String("[") + QRegExp::escape(sep) + QLatin1String("]"));
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+    QRegExp re(QLatin1Char('[') + QRegExp::escape(sep) + QLatin1Char(']'));
+#if defined(Q_OS_SYMBIAN)
+    QStringList parts = pathCopy.split(re, QString::SkipEmptyParts);
+    if (pathCopy.endsWith(sep))
+        parts.append(QString());
+#elif defined(Q_OS_WIN) || defined(Q_OS_OS2)
     QStringList parts = pathCopy.split(re, QString::SkipEmptyParts);
     if (!doubleSlash.isEmpty() && !parts.isEmpty())
 …
 #endif
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
     bool startsFromRoot = !parts.isEmpty() && parts[0].endsWith(QLatin1Char(':'));
 #else

trunk/src/gui/dialogs/qfiledialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qfiledialog.ui

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qfiledialog_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qdesktopwidget.h>
 #include <stdlib.h>
+#include <qabstracteventdispatcher.h>
 #include "ui_qfiledialog.h"
 …
         runModalForDirectory:mCurrentDir
         file:selectable ? filename : @"untitled"];
+    QAbstractEventDispatcher::instance()->interrupt();
     return (mReturnCode == NSOKButton);
+}
 …
+{
     Q_UNUSED(sender);
+    if ([filename length] == 0)
+        return NO;
     QString qtFileName = QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(filename);
     QFileInfo info(qtFileName.normalized(QT_PREPEND_NAMESPACE(QString::NormalizationForm_C)));
 …
+{
     Q_UNUSED(sender);
+    *mCurrentSelection = QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString([mSavePanel filename]));
+    if (mPriv)
+        mPriv->QNSOpenSavePanelDelegate_selectionChanged(*mCurrentSelection);
+    if (mPriv) {
+        QString selection = QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString([mSavePanel filename]));
+        if (selection != mCurrentSelection) {
+            *mCurrentSelection = selection;
+            mPriv->QNSOpenSavePanelDelegate_selectionChanged(selection);
+        }
+    }
+}
 …
                 // When changing directory, the current selection is cleared if
                 // we are supposed to be selecting files only:
-                fileDialogPrivate->mCurrentSelectionList.clear();
                 if (!fileDialogPrivate->mCurrentSelection.isEmpty()){
+                    fileDialogPrivate->mCurrentSelectionList.clear();
                     fileDialogPrivate->mCurrentSelection.clear();
                     emit fileDialogPrivate->q_func()->currentChanged(fileDialogPrivate->mCurrentSelection);
 …
     navOptions.windowTitle = QCFString::toCFStringRef(q->windowTitle());
+    static const int w = 450, h = 350;
+    navOptions.location.h = navOptions.location.v = -1;
+    navOptions.location.h = -1;
+    navOptions.location.v = -1;
     QWidget *parent = q->parentWidget();
     if (parent && parent->isVisible()) {
 …
         QString s = parent->windowTitle();
         navOptions.clientName = QCFString::toCFStringRef(s);
-        navOptions.location.h = (parent->x() + (parent->width() / 2)) - (w / 2);
-        navOptions.location.v = (parent->y() + (parent->height() / 2)) - (h / 2);
-        QRect r = QApplication::desktop()->screenGeometry(
-                QApplication::desktop()->screenNumber(parent));
-        const int border = 10;
-        if (navOptions.location.h + w > r.right())
-            navOptions.location.h -= (navOptions.location.h + w) - r.right() + border;
-        if (navOptions.location.v + h > r.bottom())
-            navOptions.location.v -= (navOptions.location.v + h) - r.bottom() + border;
-        if (navOptions.location.h < r.left())
-            navOptions.location.h = r.left() + border;
-        if (navOptions.location.v < r.top())
-            navOptions.location.v = r.top() + border;
+    }

trunk/src/gui/dialogs/qfiledialog_p.h

-              r172
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qcompleter.h>
 #include <qpointer.h>
-#include <qtimeline.h>
 #include <qdebug.h>
 #include "qsidebar_p.h"
+#include "qfscompleter_p.h"
+#include "private/qguiplatformplugin_p.h"
 #if defined (Q_OS_UNIX)
 …
 class Ui_QFileDialog;
-#ifndef QT_NO_COMPLETER
-/*!
-    QCompleter that can deal with QFileSystemModel
-  */
-class QFSCompletor :  public QCompleter {
-public:
-    QFSCompletor(QAbstractItemModel *model, QObject *parent = 0) : QCompleter(model, parent), proxyModel(0), sourceModel(0)
+    {
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
-        setCaseSensitivity(Qt::CaseInsensitive);
-#endif
+    }
-    QString pathFromIndex(const QModelIndex &index) const;
-    QStringList splitPath(const QString& path) const;
-    QAbstractProxyModel *proxyModel;
-    QFileSystemModel *sourceModel;
-};
-#endif // QT_NO_COMPLETER
 struct QFileDialogArgs
 …
 public:
+    QFileDialogPrivate() :
+#ifndef QT_NO_PROXYMODEL
+    proxyModel(0),
+#endif
+    model(0),
+    fileMode(QFileDialog::AnyFile),
+    acceptMode(QFileDialog::AcceptOpen),
+    currentHistoryLocation(-1),
+    renameAction(0),
+    deleteAction(0),
+    showHiddenAction(0),
+    useDefaultCaption(true),
+    defaultFileTypes(true),
+    fileNameLabelExplicitlySat(false),
+    nativeDialogInUse(false),
+#ifdef Q_WS_MAC
+    mDelegate(0),
+#ifndef QT_MAC_USE_COCOA
+    mDialog(0),
+    mDialogStarted(false),
+    mDialogClosed(true),
+#endif
+#endif
+    qFileDialogUi(0)
+    {}
+    QFileDialogPrivate();
     void createToolButtons();
 …
         DWORD maxLength;
         QString drive = path.left(3);
+        if (QT_WA_INLINE(::GetVolumeInformationW(reinterpret_cast<const WCHAR *>(drive.utf16()), NULL, 0, NULL, &maxLength, NULL, NULL, 0),
+            ::GetVolumeInformationA(drive.toLocal8Bit().constData(), NULL, 0, NULL, &maxLength, NULL, NULL, 0)) == FALSE)
+        if (::GetVolumeInformation(reinterpret_cast<const wchar_t *>(drive.utf16()), NULL, 0, NULL, &maxLength, NULL, NULL, 0) == FALSE)
             return -1;
         return maxLength;
 …
     static inline QString toInternal(const QString &path)
+    {
 #if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX)
+#if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) || defined(Q_OS_SYMBIAN)
         QString n(path);
         for (int i = 0; i < (int)n.length(); ++i)
 …
     QStringList watching;
     QFileSystemModel *model;
+    QFSCompletor *completer;
+#ifndef QT_NO_FSCOMPLETER
+    QFSCompleter *completer;
+#endif //QT_NO_FSCOMPLETER
     QFileDialog::FileMode fileMode;
 …
 #endif
     Ui_QFileDialog *qFileDialogUi;
+    QScopedPointer<Ui_QFileDialog> qFileDialogUi;
     QString acceptLabel;
 …
     QFileDialog::Options opts;
+    ~QFileDialogPrivate();
+private:
+    Q_DISABLE_COPY(QFileDialogPrivate)
 };
 …
 #ifndef Q_WS_MAC
     // Dummies for platforms that don't use native dialogs:
     inline void QFileDialogPrivate::deleteNativeDialog_sys() {}
     inline bool QFileDialogPrivate::setVisible_sys(bool) { return false; }
     inline QDialog::DialogCode QFileDialogPrivate::dialogResultCode_sys(){ return QDialog::Rejected; }
     inline void QFileDialogPrivate::setDirectory_sys(const QString &) {}
     inline QString QFileDialogPrivate::directory_sys() const { return QString(); }
     inline void QFileDialogPrivate::selectFile_sys(const QString &) {}
     inline QStringList QFileDialogPrivate::selectedFiles_sys() const { return QStringList(); }
     inline void QFileDialogPrivate::setFilter_sys() {}
     inline void QFileDialogPrivate::setNameFilters_sys(const QStringList &) {}
     inline void QFileDialogPrivate::selectNameFilter_sys(const QString &) {}
     inline QString QFileDialogPrivate::selectedNameFilter_sys() const { return QString(); }
+    inline void QFileDialogPrivate::deleteNativeDialog_sys() { qt_guiPlatformPlugin()->fileDialogDelete(q_func()); }
+    inline bool QFileDialogPrivate::setVisible_sys(bool visible) { return qt_guiPlatformPlugin()->fileDialogSetVisible(q_func(), visible); }
+    inline QDialog::DialogCode QFileDialogPrivate::dialogResultCode_sys(){ return qt_guiPlatformPlugin()->fileDialogResultCode(q_func()); }
+    inline void QFileDialogPrivate::setDirectory_sys(const QString &directory) { qt_guiPlatformPlugin()->fileDialogSetDirectory(q_func(), directory); }
+    inline QString QFileDialogPrivate::directory_sys() const { return qt_guiPlatformPlugin()->fileDialogDirectory(q_func()); }
+    inline void QFileDialogPrivate::selectFile_sys(const QString &filename) { qt_guiPlatformPlugin()->fileDialogSelectFile(q_func(), filename); }
+    inline QStringList QFileDialogPrivate::selectedFiles_sys() const { return qt_guiPlatformPlugin()->fileDialogSelectedFiles(q_func()); }
+    inline void QFileDialogPrivate::setFilter_sys() { qt_guiPlatformPlugin()->fileDialogSetFilter(q_func()); }
+    inline void QFileDialogPrivate::setNameFilters_sys(const QStringList &filters) { qt_guiPlatformPlugin()->fileDialogSetNameFilters(q_func(), filters); }
+    inline void QFileDialogPrivate::selectNameFilter_sys(const QString &filter) { qt_guiPlatformPlugin()->fileDialogSelectNameFilter(q_func(), filter); }
+    inline QString QFileDialogPrivate::selectedNameFilter_sys() const { return qt_guiPlatformPlugin()->fileDialogSelectedNameFilter(q_func()); }
 #endif

trunk/src/gui/dialogs/qfiledialog_win.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <shlobj.h>
+#ifdef Q_OS_WINCE
+//At some point we can hope that mingw will support that interface
+#if !defined(Q_WS_WINCE) && !defined(Q_CC_MINGW)
+#include <shobjidl.h>
+#endif
+#include <objbase.h>
+#if defined(__IFileDialog_INTERFACE_DEFINED__) \
+        && defined(__IFileOpenDialog_INTERFACE_DEFINED__)
+#define USE_COMMON_ITEM_DIALOG
+#endif
+#ifdef Q_WS_WINCE
 #include <commdlg.h>
 #  ifndef BFFM_SETSELECTION
 …
     HWND          hwndOwner;
     LPCITEMIDLIST pidlRoot;
     LPTSTR        pszDisplayName;
     LPCTSTR       lpszTitle;
+    LPWSTR        pszDisplayName;
+    LPCWSTR       lpszTitle;
     UINT          ulFlags;
     BFFCALLBACK   lpfn;
 …
 typedef BOOL (WINAPI *PtrSHGetPathFromIDList)(LPITEMIDLIST,LPWSTR);
 static PtrSHGetPathFromIDList ptrSHGetPathFromIDList = 0;
+typedef HRESULT (WINAPI *PtrSHGetMalloc)(LPMALLOC *);
+static PtrSHGetMalloc ptrSHGetMalloc = 0;
 QT_BEGIN_NAMESPACE
 …
         triedResolve = true;
+        if (!(QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)) {
+#if !defined(Q_OS_WINCE)
             QLibrary lib(QLatin1String("shell32"));
             ptrSHBrowseForFolder = (PtrSHBrowseForFolder) lib.resolve("SHBrowseForFolderW");
             ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList) lib.resolve("SHGetPathFromIDListW");
+#if !defined(Q_WS_WINCE)
+        QLibrary lib(QLatin1String("shell32"));
+        ptrSHBrowseForFolder = (PtrSHBrowseForFolder) lib.resolve("SHBrowseForFolderW");
+        ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList) lib.resolve("SHGetPathFromIDListW");
+        ptrSHGetMalloc = (PtrSHGetMalloc) lib.resolve("SHGetMalloc");
 #else
             // CE stores them in a different lib and does not use unicode version
             HINSTANCE handle = LoadLibraryW(L"Ceshell");
             ptrSHBrowseForFolder = (PtrSHBrowseForFolder)GetProcAddress(handle, L"SHBrowseForFolder");
             ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList)GetProcAddress(handle, L"SHGetPathFromIDList");
             if (ptrSHBrowseForFolder && ptrSHGetPathFromIDList)
                 qt_priv_ptr_valid = true;
+#endif
+        }
+        // CE stores them in a different lib and does not use unicode version
+        HINSTANCE handle = LoadLibraryW(L"Ceshell");
+        ptrSHBrowseForFolder = (PtrSHBrowseForFolder)GetProcAddress(handle, L"SHBrowseForFolder");
+        ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList)GetProcAddress(handle, L"SHGetPathFromIDList");
+        ptrSHGetMalloc = (PtrSHGetMalloc)GetProcAddress(handle, L"SHGetMalloc");
+        if (ptrSHBrowseForFolder && ptrSHGetPathFromIDList && ptrSHGetMalloc)
+            qt_priv_ptr_valid = true;
+#endif
+    }
+}
 …
 // Makes a NUL-oriented Windows filter from a Qt filter.
 static QString qt_win_filter(const QString &filter)
+static QString qt_win_filter(const QString &filter, bool hideFiltersDetails)
+{
     QStringList filterLst = qt_win_make_filters_list(filter);
     QStringList::Iterator it = filterLst.begin();
     QString winfilters;
+    QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
     for (; it != filterLst.end(); ++it) {
         QString subfilter = *it;
         if (!subfilter.isEmpty()) {
+            winfilters += subfilter;
+            if (hideFiltersDetails) {
+                int index = r.indexIn(subfilter);
+                if (index >= 0)
+                    winfilters += r.cap(1);
+            } else {
+                winfilters += subfilter;
+            }
             winfilters += QChar();
             winfilters += qt_win_extract_filter(subfilter);
 …
+}
-#ifndef Q_OS_WINCE
-// Static vars for OFNA funcs:
-static QByteArray aInitDir;
-static QByteArray aInitSel;
-static QByteArray aTitle;
-static QByteArray aFilter;
-// Use ANSI strings and API
-// If you change this, then make sure you change qt_win_make_OFN (below) too
-static OPENFILENAMEA *qt_win_make_OFNA(QWidget *parent,
-                                       const QString &initialSelection,
-                                       const QString &initialDirectory,
-                                       const QString &title,
-                                       const QString &filters,
-                                       QFileDialog::FileMode mode,
-                                       QFileDialog::Options options)
+{
-    if (parent)
-        parent = parent->window();
-    else
-        parent = qApp->activeWindow();
-    aTitle = title.toLocal8Bit();
-    aInitDir = QDir::toNativeSeparators(initialDirectory).toLocal8Bit();
-    if (initialSelection.isEmpty()) {
-        aInitSel = "";
-    } else {
-        aInitSel = QDir::toNativeSeparators(initialSelection).toLocal8Bit();
-        aInitSel.replace("<", "");
-        aInitSel.replace(">", "");
-        aInitSel.replace("\"", "");
-        aInitSel.replace("|", "");
+    }
-    int maxLen = mode == QFileDialog::ExistingFiles ? maxMultiLen : maxNameLen;
-    aInitSel.resize(maxLen + 1);                // make room for return value
-    aFilter = filters.toLocal8Bit();
-    OPENFILENAMEA* ofn = new OPENFILENAMEA;
-    memset(ofn, 0, sizeof(OPENFILENAMEA));
-#if defined(Q_CC_BOR) && (WINVER >= 0x0500) && (_WIN32_WINNT >= 0x0500)
-    // according to the MSDN, this should also be necessary for MSVC, but
-    // OPENFILENAME_SIZE_VERSION_400A is in not Microsoft header, as it seems
-    if (QApplication::winVersion()==Qt::WV_NT || QApplication::winVersion()&Qt::WV_DOS_based) {
-        ofn->lStructSize = OPENFILENAME_SIZE_VERSION_400A;
-    } else {
-        ofn->lStructSize = sizeof(OPENFILENAMEA);
+    }
-#else
-    ofn->lStructSize = sizeof(OPENFILENAMEA);
-#endif
-    Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created));
-    ofn->hwndOwner = parent ? parent->winId() : 0;
-    ofn->lpstrFilter = aFilter;
-    ofn->lpstrFile = aInitSel.data();
-    ofn->nMaxFile = maxLen;
-    ofn->lpstrInitialDir = aInitDir.data();
-    ofn->lpstrTitle = aTitle.data();
-    ofn->Flags = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY | OFN_EXPLORER);
-    if (mode == QFileDialog::ExistingFile ||
-         mode == QFileDialog::ExistingFiles)
-        ofn->Flags |= (OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST);
-    if (mode == QFileDialog::ExistingFiles)
-        ofn->Flags |= (OFN_ALLOWMULTISELECT);
-    if (!(options & QFileDialog::DontConfirmOverwrite))
-        ofn->Flags |= OFN_OVERWRITEPROMPT;
-    return ofn;
+}
-static void qt_win_clean_up_OFNA(OPENFILENAMEA **ofn)
+{
-    delete *ofn;
-    *ofn = 0;
+}
-#endif
 static QString tFilters, tTitle, tInitDir;
-#ifdef UNICODE
-// If you change this, then make sure you change qt_win_make_OFNA (above) too
 static OPENFILENAME* qt_win_make_OFN(QWidget *parent,
                                      const QString& initialSelection,
 …
                                      const QString& filters,
                                      QFileDialog::FileMode mode,
                                      QFileDialog::Options options)
+                                     QFileDialog::Options options)
+{
     if (parent)
         parent = parent->window();
     else
         parent = qApp->activeWindow();
+        parent = QApplication::activeWindow();
     tInitDir = QDir::toNativeSeparators(initialDirectory);
 …
     QString initSel = QDir::toNativeSeparators(initialSelection);
     if (!initSel.isEmpty()) {
         initSel.replace(QLatin1String("<"), QLatin1String(""));
         initSel.replace(QLatin1String(">"), QLatin1String(""));
         initSel.replace(QLatin1String("\""), QLatin1String(""));
         initSel.replace(QLatin1String("|"), QLatin1String(""));
+        initSel.remove(QLatin1Char('<'));
+        initSel.remove(QLatin1Char('>'));
+        initSel.remove(QLatin1Char('\"'));
+        initSel.remove(QLatin1Char('|'));
+    }
     int maxLen = mode == QFileDialog::ExistingFiles ? maxMultiLen : maxNameLen;
     TCHAR *tInitSel = new TCHAR[maxLen+1];
+    wchar_t *tInitSel = new wchar_t[maxLen + 1];
     if (initSel.length() > 0 && initSel.length() <= maxLen)
         memcpy(tInitSel, initSel.utf16(), (initSel.length()+1)*sizeof(QChar));
 …
     memset(ofn, 0, sizeof(OPENFILENAME));
-#if defined(Q_CC_BOR) && (WINVER >= 0x0500) && (_WIN32_WINNT >= 0x0500)
-    // according to the MSDN, this should also be necessary for MSVC, but
-    // OPENFILENAME_SIZE_VERSION_400 is in not Microsoft header, as it seems
-    if (QApplication::winVersion()==Qt::WV_NT || QApplication::winVersion()&Qt::WV_DOS_based) {
-        ofn->lStructSize= OPENFILENAME_SIZE_VERSION_400;
-    } else {
-        ofn->lStructSize = sizeof(OPENFILENAME);
+    }
-#else
     ofn->lStructSize = sizeof(OPENFILENAME);
-#endif
     Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created));
     ofn->hwndOwner = parent ? parent->winId() : 0;
     ofn->lpstrFilter = (TCHAR *)tFilters.utf16();
+    ofn->lpstrFilter = (wchar_t*)tFilters.utf16();
     ofn->lpstrFile = tInitSel;
     ofn->nMaxFile = maxLen;
     ofn->lpstrInitialDir = (TCHAR *)tInitDir.utf16();
     ofn->lpstrTitle = (TCHAR *)tTitle.utf16();
     ofn->Flags = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY | OFN_EXPLORER);
+    ofn->lpstrInitialDir = (wchar_t*)tInitDir.utf16();
+    ofn->lpstrTitle = (wchar_t*)tTitle.utf16();
+    ofn->Flags = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_PATHMUSTEXIST);
     if (mode == QFileDialog::ExistingFile ||
          mode == QFileDialog::ExistingFiles)
         ofn->Flags |= (OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST);
+        ofn->Flags |= (OFN_FILEMUSTEXIST);
     if (mode == QFileDialog::ExistingFiles)
         ofn->Flags |= (OFN_ALLOWMULTISELECT);
 …
+}
 static void qt_win_clean_up_OFN(OPENFILENAME **ofn)
+{
 …
     *ofn = 0;
+}
-#endif // UNICODE
 extern void qt_win_eatMouseMove();
 …
     modal_widget.setParent(args.parent, Qt::Window);
     QApplicationPrivate::enterModal(&modal_widget);
+    QT_WA({
+        // Use Unicode strings and API
+        OPENFILENAME* ofn = qt_win_make_OFN(args.parent, args.selection,
+                                            args.directory, args.caption,
+                                            qt_win_filter(args.filter),
+                                            QFileDialog::ExistingFile,
+                                            args.options);
+        if (idx)
+            ofn->nFilterIndex = idx + 1;
+        if (GetOpenFileName(ofn)) {
+            result = QString::fromUtf16((ushort*)ofn->lpstrFile);
+            selFilIdx = ofn->nFilterIndex;
+        }
+        qt_win_clean_up_OFN(&ofn);
+    } , {
+        // Use ANSI strings and API
+        OPENFILENAMEA* ofn = qt_win_make_OFNA(args.parent, args.selection,
+                                              args.directory, args.caption,
+                                              qt_win_filter(args.filter),
+                                              QFileDialog::ExistingFile,
+                                              args.options);
+        if (idx)
+            ofn->nFilterIndex = idx + 1;
+        if (GetOpenFileNameA(ofn)) {
+            result = QString::fromLocal8Bit(ofn->lpstrFile);
+            selFilIdx = ofn->nFilterIndex;
+        }
+        qt_win_clean_up_OFNA(&ofn);
+    });
+    bool hideFiltersDetails = args.options & QFileDialog::HideNameFilterDetails;
+    OPENFILENAME* ofn = qt_win_make_OFN(args.parent, args.selection,
+                                        args.directory, args.caption,
+                                        qt_win_filter(args.filter, hideFiltersDetails),
+                                        QFileDialog::ExistingFile,
+                                        args.options);
+    if (idx)
+        ofn->nFilterIndex = idx + 1;
+    if (GetOpenFileName(ofn)) {
+        result = QString::fromWCharArray(ofn->lpstrFile);
+        selFilIdx = ofn->nFilterIndex;
+    }
+    qt_win_clean_up_OFN(&ofn);
     QApplicationPrivate::leaveModal(&modal_widget);
 …
 QString qt_win_get_save_file_name(const QFileDialogArgs &args,
                                   QString *initialDirectory,
                                   QString *selectedFilter)
+                                  QString *selectedFilter)
+{
     QString result;
 …
     modal_widget.setParent(args.parent, Qt::Window);
     QApplicationPrivate::enterModal(&modal_widget);
+    bool hideFiltersDetails = args.options & QFileDialog::HideNameFilterDetails;
     // This block is used below for the lpstrDefExt member.
     // Note that the current MSDN docs document this member wrong.
 …
+    }
+    QT_WA({
+        // Use Unicode strings and API
+        OPENFILENAME *ofn = qt_win_make_OFN(args.parent, args.selection,
+                                            args.directory, args.caption,
+                                            qt_win_filter(args.filter),
+                                            QFileDialog::AnyFile,
+                                            args.options);
+        ofn->lpstrDefExt = (TCHAR *)defaultSaveExt.utf16();
+        if (idx)
+            ofn->nFilterIndex = idx + 1;
+        if (GetSaveFileName(ofn)) {
+            result = QString::fromUtf16((ushort*)ofn->lpstrFile);
+            selFilIdx = ofn->nFilterIndex;
+        }
+        qt_win_clean_up_OFN(&ofn);
+    } , {
+        // Use ANSI strings and API
+        OPENFILENAMEA *ofn = qt_win_make_OFNA(args.parent, args.selection,
+                                              args.directory, args.caption,
+                                              qt_win_filter(args.filter),
+                                              QFileDialog::AnyFile,
+                                              args.options);
+        QByteArray asciiExt = defaultSaveExt.toAscii();
+        ofn->lpstrDefExt = asciiExt.data();
+        if (idx)
+            ofn->nFilterIndex = idx + 1;
+        if (GetSaveFileNameA(ofn)) {
+            result = QString::fromLocal8Bit(ofn->lpstrFile);
+            selFilIdx = ofn->nFilterIndex;
+        }
+        qt_win_clean_up_OFNA(&ofn);
+    });
+#if defined(Q_OS_WINCE)
+    OPENFILENAME *ofn = qt_win_make_OFN(args.parent, args.selection,
+                                        args.directory, args.caption,
+                                        qt_win_filter(args.filter, hideFiltersDetails),
+                                        QFileDialog::AnyFile,
+                                        args.options);
+    ofn->lpstrDefExt = (wchar_t*)defaultSaveExt.utf16();
+    if (idx)
+        ofn->nFilterIndex = idx + 1;
+    if (GetSaveFileName(ofn)) {
+        result = QString::fromWCharArray(ofn->lpstrFile);
+        selFilIdx = ofn->nFilterIndex;
+    }
+    qt_win_clean_up_OFN(&ofn);
+#if defined(Q_WS_WINCE)
     int semIndex = result.indexOf(QLatin1Char(';'));
     if (semIndex >= 0)
 …
+}
+QStringList qt_win_get_open_file_names(const QFileDialogArgs &args,
+#if defined(USE_COMMON_ITEM_DIALOG)
+typedef HRESULT (WINAPI *PtrSHCreateItemFromParsingName)(PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv);
+static PtrSHCreateItemFromParsingName pSHCreateItemFromParsingName = 0;
+static bool qt_win_set_IFileDialogOptions(IFileDialog *pfd,
+                                          const QString& initialSelection,
+                                          const QString& initialDirectory,
+                                          const QString& title,
+                                          const QStringList& filterLst,
+                                          QFileDialog::FileMode mode,
+                                          QFileDialog::Options options)
+{
+    if (!pSHCreateItemFromParsingName) {
+        // This function is available only in Vista & above.
+        QLibrary shellLib(QLatin1String("Shell32"));
+        pSHCreateItemFromParsingName = (PtrSHCreateItemFromParsingName)
+            shellLib.resolve("SHCreateItemFromParsingName");
+        if (!pSHCreateItemFromParsingName)
+            return false;
+    }
+    HRESULT hr;
+    QString winfilters;
+    int numFilters = 0;
+    quint32 currentOffset = 0;
+    QList<quint32> offsets;
+    QStringList::ConstIterator it = filterLst.begin();
+    // Create the native filter string and save offset to each entry.
+    for (; it != filterLst.end(); ++it) {
+        QString subfilter = *it;
+        if (!subfilter.isEmpty()) {
+            offsets<<currentOffset;
+            //Here the COMMON_ITEM_DIALOG API always add the details for the filter (e.g. *.txt)
+            //so we don't need to handle the flag HideNameFilterDetails.
+            winfilters += subfilter; // The name of the filter.
+            winfilters += QChar();
+            currentOffset += subfilter.size()+1;
+            offsets<<currentOffset;
+            QString spec = qt_win_extract_filter(subfilter);
+            winfilters += spec; // The actual filter spec.
+            winfilters += QChar();
+            currentOffset += spec.size()+1;
+            numFilters++;
+        }
+    }
+    // Add the filters to the file dialog.
+    if (numFilters) {
+        wchar_t *szData = (wchar_t*)winfilters.utf16();
+        COMDLG_FILTERSPEC *filterSpec = new COMDLG_FILTERSPEC[numFilters];
+        for(int i = 0; i<numFilters; i++) {
+            filterSpec[i].pszName = szData+offsets[i*2];
+            filterSpec[i].pszSpec = szData+offsets[(i*2)+1];
+        }
+        hr = pfd->SetFileTypes(numFilters, filterSpec);
+        delete []filterSpec;
+    }
+    // Set the starting folder.
+    tInitDir = QDir::toNativeSeparators(initialDirectory);
+    if (!tInitDir.isEmpty()) {
+        IShellItem *psiDefaultFolder;
+        hr = pSHCreateItemFromParsingName((wchar_t*)tInitDir.utf16(),
+                                      NULL,
+                                      IID_PPV_ARGS(&psiDefaultFolder));
+        if (SUCCEEDED(hr)) {
+            hr = pfd->SetFolder(psiDefaultFolder);
+            psiDefaultFolder->Release();
+        }
+    }
+    // Set the currently selected file.
+    QString initSel = QDir::toNativeSeparators(initialSelection);
+    if (!initSel.isEmpty()) {
+        initSel.remove(QLatin1Char('<'));
+        initSel.remove(QLatin1Char('>'));
+        initSel.remove(QLatin1Char('\"'));
+        initSel.remove(QLatin1Char('|'));
+    }
+    if (!initSel.isEmpty()) {
+        hr = pfd->SetFileName((wchar_t*)initSel.utf16());
+    }
+    // Set the title for the file dialog.
+    if (!title.isEmpty()) {
+        hr = pfd->SetTitle((wchar_t*)title.utf16());
+    }
+    // Set other flags for the dialog.
+    DWORD newOptions;
+    hr = pfd->GetOptions(&newOptions);
+    if (SUCCEEDED(hr)) {
+        newOptions |= FOS_NOCHANGEDIR;
+        if (mode == QFileDialog::ExistingFile ||
+             mode == QFileDialog::ExistingFiles)
+            newOptions |= (FOS_FILEMUSTEXIST | FOS_PATHMUSTEXIST);
+        if (mode == QFileDialog::ExistingFiles)
+            newOptions |= FOS_ALLOWMULTISELECT;
+        if (!(options & QFileDialog::DontConfirmOverwrite))
+            newOptions |= FOS_OVERWRITEPROMPT;
+        hr = pfd->SetOptions(newOptions);
+    }
+    return SUCCEEDED(hr);
+}
+QStringList qt_win_CID_get_open_file_names(const QFileDialogArgs &args,
                                        QString *initialDirectory,
+                                       QString *selectedFilter)
+                                       const QStringList &filterList,
+                                       QString *selectedFilter,
+                                       int selectedFilterIndex)
+{
     QStringList result;
-    QFileInfo fi;
-    QDir dir;
-    QString isel;
-    if (initialDirectory && initialDirectory->left(5) == QLatin1String("file:"))
-        initialDirectory->remove(0, 5);
-    fi = QFileInfo(*initialDirectory);
-    if (initialDirectory && !fi.isDir()) {
-        *initialDirectory = fi.absolutePath();
-        isel = fi.fileName();
+    }
-    if (!fi.exists())
-        *initialDirectory = QDir::homePath();
-    DWORD selFilIdx = 0;
-    int idx = 0;
-    if (selectedFilter) {
-        QStringList filterLst = qt_win_make_filters_list(args.filter);
-        idx = filterLst.indexOf(*selectedFilter);
+    }
     QDialog modal_widget;
     modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true);
     modal_widget.setParent(args.parent, Qt::Window);
     QApplicationPrivate::enterModal(&modal_widget);
+    QT_WA({
+        OPENFILENAME* ofn = qt_win_make_OFN(args.parent, args.selection,
+                                            args.directory, args.caption,
+                                            qt_win_filter(args.filter),
+                                            QFileDialog::ExistingFiles,
+                                            args.options);
+        if (idx)
+            ofn->nFilterIndex = idx + 1;
+        if (GetOpenFileName(ofn)) {
+            QString fileOrDir = QString::fromUtf16((ushort*)ofn->lpstrFile);
+            selFilIdx = ofn->nFilterIndex;
+            int offset = fileOrDir.length() + 1;
+            if (ofn->lpstrFile[offset] == 0) {
+                // Only one file selected; has full path
+                fi.setFile(fileOrDir);
+    // Multiple selection is allowed only in IFileOpenDialog.
+    IFileOpenDialog *pfd = 0;
+    HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog,
+                                  NULL,
+                                  CLSCTX_INPROC_SERVER,
+                                  IID_PPV_ARGS(&pfd));
+    if (SUCCEEDED(hr)) {
+        qt_win_set_IFileDialogOptions(pfd, args.selection,
+                                      args.directory, args.caption,
+                                      filterList, QFileDialog::ExistingFiles,
+                                      args.options);
+        // Set the currently selected filter (one-based index).
+        hr = pfd->SetFileTypeIndex(selectedFilterIndex+1);
+        QWidget *parentWindow = args.parent;
+        if (parentWindow)
+            parentWindow = parentWindow->window();
+        else
+            parentWindow = QApplication::activeWindow();
+        // Show the file dialog.
+        hr = pfd->Show(parentWindow ? parentWindow->winId() : 0);
+        if (SUCCEEDED(hr)) {
+            // Retrieve the results.
+            IShellItemArray *psiaResults;
+            hr = pfd->GetResults(&psiaResults);
+            if (SUCCEEDED(hr)) {
+                DWORD numItems = 0;
+                psiaResults->GetCount(&numItems);
+                for (DWORD i = 0; i<numItems; i++) {
+                    IShellItem *psi = 0;
+                    hr = psiaResults->GetItemAt(i, &psi);
+                    if (SUCCEEDED(hr)) {
+                        // Retrieve the file name from shell item.
+                        wchar_t *pszPath;
+                        hr = psi->GetDisplayName(SIGDN_FILESYSPATH, &pszPath);
+                        if (SUCCEEDED(hr)) {
+                            QString fileName = QString::fromWCharArray(pszPath);
+                            result.append(fileName);
+                            CoTaskMemFree(pszPath);
+                        }
+                        psi->Release(); // Free the current item.
+                    }
+                }
+                psiaResults->Release(); // Free the array of items.
+            }
+        }
+    }
+    QApplicationPrivate::leaveModal(&modal_widget);
+    qt_win_eatMouseMove();
+    if (!result.isEmpty()) {
+        // Retrieve the current folder name.
+        IShellItem *psi = 0;
+        hr = pfd->GetFolder(&psi);
+        if (SUCCEEDED(hr)) {
+            wchar_t *pszPath;
+            hr = psi->GetDisplayName(SIGDN_FILESYSPATH, &pszPath);
+            if (SUCCEEDED(hr)) {
+                *initialDirectory = QString::fromWCharArray(pszPath);
+                CoTaskMemFree(pszPath);
+            }
+            psi->Release();
+        }
+        // Retrieve the currently selected filter.
+        if (selectedFilter) {
+            quint32 filetype = 0;
+            hr = pfd->GetFileTypeIndex(&filetype);
+            if (SUCCEEDED(hr) && filetype && filetype <= (quint32)filterList.length()) {
+                // This is a one-based index, not zero-based.
+                *selectedFilter = filterList[filetype-1];
+            }
+        }
+    }
+    if (pfd)
+        pfd->Release();
+    return result;
+}
+#endif
+QStringList qt_win_get_open_file_names(const QFileDialogArgs &args,
+                                       QString *initialDirectory,
+                                       QString *selectedFilter)
+{
+    QFileInfo fi;
+    QDir dir;
+    if (initialDirectory && initialDirectory->left(5) == QLatin1String("file:"))
+        initialDirectory->remove(0, 5);
+    fi = QFileInfo(*initialDirectory);
+    if (initialDirectory && !fi.isDir()) {
+        *initialDirectory = fi.absolutePath();
+    }
+    if (!fi.exists())
+        *initialDirectory = QDir::homePath();
+    DWORD selFilIdx = 0;
+    QStringList filterLst = qt_win_make_filters_list(args.filter);
+    int idx = 0;
+    if (selectedFilter) {
+        idx = filterLst.indexOf(*selectedFilter);
+    }
+    // Windows Vista (& above) allows users to search from file dialogs. If user selects
+    // multiple files belonging to different folders from these search results, the
+    // GetOpenFileName() will return only one folder name for all the files. To retrieve
+    // the correct path for all selected files, we have to use Common Item Dialog interfaces.
+#if defined(USE_COMMON_ITEM_DIALOG)
+    if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
+        return qt_win_CID_get_open_file_names(args, initialDirectory, filterLst, selectedFilter, idx);
+#endif
+    QStringList result;
+    QDialog modal_widget;
+    modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true);
+    modal_widget.setParent(args.parent, Qt::Window);
+    QApplicationPrivate::enterModal(&modal_widget);
+    bool hideFiltersDetails = args.options & QFileDialog::HideNameFilterDetails;
+    OPENFILENAME* ofn = qt_win_make_OFN(args.parent, args.selection,
+                                        args.directory, args.caption,
+                                        qt_win_filter(args.filter, hideFiltersDetails),
+                                        QFileDialog::ExistingFiles,
+                                        args.options);
+    if (idx)
+        ofn->nFilterIndex = idx + 1;
+    if (GetOpenFileName(ofn)) {
+        QString fileOrDir = QString::fromWCharArray(ofn->lpstrFile);
+        selFilIdx = ofn->nFilterIndex;
+        int offset = fileOrDir.length() + 1;
+        if (ofn->lpstrFile[offset] == 0) {
+            // Only one file selected; has full path
+            fi.setFile(fileOrDir);
+            QString res = fi.absoluteFilePath();
+            if (!res.isEmpty())
+                result.append(res);
+        }
+        else {
+            // Several files selected; first string is path
+            dir.setPath(fileOrDir);
+            QString f;
+            while(!(f = QString::fromWCharArray(ofn->lpstrFile + offset)).isEmpty()) {
+                fi.setFile(dir, f);
                 QString res = fi.absoluteFilePath();
                 if (!res.isEmpty())
                     result.append(res);
+                offset += f.length() + 1;
+            }
+            else {
+                // Several files selected; first string is path
+                dir.setPath(fileOrDir);
+                QString f;
+                while(!(f = QString::fromUtf16((ushort*)ofn->lpstrFile+offset)).isEmpty()) {
+                    fi.setFile(dir, f);
+                    QString res = fi.absoluteFilePath();
+                    if (!res.isEmpty())
+                        result.append(res);
+                    offset += f.length() + 1;
+                }
+            }
+        }
+        qt_win_clean_up_OFN(&ofn);
+    } , {
+        OPENFILENAMEA* ofn = qt_win_make_OFNA(args.parent, args.selection,
+                                              args.directory, args.caption,
+                                              qt_win_filter(args.filter),
+                                              QFileDialog::ExistingFiles,
+                                              args.options);
+        if (idx)
+            ofn->nFilterIndex = idx + 1;
+        if (GetOpenFileNameA(ofn)) {
+            QByteArray fileOrDir(ofn->lpstrFile);
+            selFilIdx = ofn->nFilterIndex;
+            int offset = fileOrDir.length() + 1;
+            if (ofn->lpstrFile[offset] == '\0') {
+                // Only one file selected; has full path
+                fi.setFile(QString::fromLocal8Bit(fileOrDir));
+                QString res = fi.absoluteFilePath();
+                if (!res.isEmpty())
+                    result.append(res);
+            }
+            else {
+                // Several files selected; first string is path
+                dir.setPath(QString::fromLocal8Bit(fileOrDir));
+                QByteArray f;
+                while (!(f = QByteArray(ofn->lpstrFile + offset)).isEmpty()) {
+                    fi.setFile(dir, QString::fromLocal8Bit(f));
+                    QString res = fi.absoluteFilePath();
+                    if (!res.isEmpty())
+                        result.append(res);
+                    offset += f.length() + 1;
+                }
+            }
+            qt_win_clean_up_OFNA(&ofn);
+        }
+    });
+        }
+    }
+    qt_win_clean_up_OFN(&ofn);
     QApplicationPrivate::leaveModal(&modal_widget);
 …
         QString *initDir = (QString *)(lpData);
         if (!initDir->isEmpty()) {
+            // ### Lars asks: is this correct for the A version????
+            QT_WA({
+                SendMessage(hwnd, BFFM_SETSELECTION, TRUE, LPARAM(initDir->utf16()));
+            } , {
+                SendMessageA(hwnd, BFFM_SETSELECTION, TRUE, LPARAM(initDir->utf16()));
+            });
+            SendMessage(hwnd, BFFM_SETSELECTION, TRUE, LPARAM(initDir->utf16()));
+        }
     } else if (uMsg == BFFM_SELCHANGED) {
         QT_WA({
             qt_win_resolve_libs();
             TCHAR path[MAX_PATH];
+        qt_win_resolve_libs();
+        if (ptrSHGetPathFromIDList) {
+            wchar_t path[MAX_PATH];
             ptrSHGetPathFromIDList(LPITEMIDLIST(lParam), path);
             QString tmpStr = QString::fromUtf16((ushort*)path);
+            QString tmpStr = QString::fromWCharArray(path);
             if (!tmpStr.isEmpty())
                 SendMessage(hwnd, BFFM_ENABLEOK, 1, 1);
 …
                 SendMessage(hwnd, BFFM_ENABLEOK, 0, 0);
             SendMessage(hwnd, BFFM_SETSTATUSTEXT, 1, LPARAM(path));
+        } , {
+            char path[MAX_PATH];
+            SHGetPathFromIDListA(LPITEMIDLIST(lParam), path);
+            QString tmpStr = QString::fromLocal8Bit(path);
+            if (!tmpStr.isEmpty())
+                SendMessageA(hwnd, BFFM_ENABLEOK, 1, 1);
+            else
+                SendMessageA(hwnd, BFFM_ENABLEOK, 0, 0);
+            SendMessageA(hwnd, BFFM_SETSTATUSTEXT, 1, LPARAM(path));
+        });
+        }
+    }
     return 0;
 …
         parent = parent->window();
     else
         parent = qApp->activeWindow();
+        parent = QApplication::activeWindow();
     if (parent)
         parent->createWinId();
 …
     modal_widget.setParent(parent, Qt::Window);
     QApplicationPrivate::enterModal(&modal_widget);
+#if !defined(Q_OS_WINCE)
+    QT_WA({
+        qt_win_resolve_libs();
+        QString initDir = QDir::toNativeSeparators(args.directory);
+        TCHAR path[MAX_PATH];
+        TCHAR initPath[MAX_PATH];
+        initPath[0] = 0;
+        path[0] = 0;
+        tTitle = args.caption;
+        BROWSEINFO bi;
+        Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created));
+        bi.hwndOwner = (parent ? parent->winId() : 0);
+        bi.pidlRoot = NULL;
+        //### This does not seem to be respected? - the dialog always displays "Browse for folder"
+        bi.lpszTitle = (TCHAR*)tTitle.utf16();
+        bi.pszDisplayName = initPath;
+        bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NEWDIALOGSTYLE;
+        bi.lpfn = winGetExistDirCallbackProc;
+        bi.lParam = LPARAM(&initDir);
+        if (ptrSHBrowseForFolder) {
+            LPITEMIDLIST pItemIDList = ptrSHBrowseForFolder(&bi);
+            if (pItemIDList && ptrSHGetPathFromIDList) {
+                ptrSHGetPathFromIDList(pItemIDList, path);
+                IMalloc *pMalloc;
+                if (SHGetMalloc(&pMalloc) != NOERROR)
+                    result = QString();
+                else {
+                    pMalloc->Free(pItemIDList);
+                    pMalloc->Release();
+                    result = QString::fromUtf16((ushort*)path);
+                }
+            } else
+                result = QString();
+        }
+        tTitle = QString();
+    } , {
+        QString initDir = QDir::toNativeSeparators(args.directory);
+        char path[MAX_PATH];
+        char initPath[MAX_PATH];
+        QByteArray ctitle = args.caption.toLocal8Bit();
+        initPath[0]=0;
+        path[0]=0;
+        BROWSEINFOA bi;
+        Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created));
+        bi.hwndOwner = (parent ? parent->winId() : 0);
+        bi.pidlRoot = NULL;
+        bi.lpszTitle = ctitle;
+        bi.pszDisplayName = initPath;
+        bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NEWDIALOGSTYLE;
+        bi.lpfn = winGetExistDirCallbackProc;
+        bi.lParam = LPARAM(&initDir);
+        LPITEMIDLIST pItemIDList = SHBrowseForFolderA(&bi);
+        if (pItemIDList) {
+            SHGetPathFromIDListA(pItemIDList, path);
+            IMalloc *pMalloc;
+            if (SHGetMalloc(&pMalloc) != NOERROR)
+                result = QString();
+            else {
+                pMalloc->Free(pItemIDList);
+                pMalloc->Release();
+                result = QString::fromLocal8Bit(path);
+            }
+        } else
+            result = QString();
+    });
+    QString initDir = QDir::toNativeSeparators(args.directory);
+    wchar_t path[MAX_PATH];
+    wchar_t initPath[MAX_PATH];
+    initPath[0] = 0;
+    path[0] = 0;
+    tTitle = args.caption;
+#if !defined(Q_WS_WINCE)
+    BROWSEINFO bi;
 #else
-    qt_win_resolve_libs();
-    QString initDir = QDir::toNativeSeparators(args.directory);
-    TCHAR path[MAX_PATH];
-    TCHAR initPath[MAX_PATH];
-    memset(initPath, 0 , MAX_PATH*sizeof(TCHAR));
-    memset(path, 0, MAX_PATH*sizeof(TCHAR));
-    tTitle = args.caption;
     qt_BROWSEINFO bi;
+#endif
     Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created));
     bi.hwndOwner = (parent ? parent->winId() : 0);
     bi.pidlRoot = NULL;
+    bi.lpszTitle = (TCHAR*)tTitle.utf16();
+    //### This does not seem to be respected? - the dialog always displays "Browse for folder"
+    bi.lpszTitle = (wchar_t*)tTitle.utf16();
     bi.pszDisplayName = initPath;
     bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NEWDIALOGSTYLE;
     bi.lpfn = winGetExistDirCallbackProc;
     bi.lParam = LPARAM(&initDir);
+    qt_win_resolve_libs();
     if (ptrSHBrowseForFolder) {
         LPITEMIDLIST pItemIDList = ptrSHBrowseForFolder((BROWSEINFO*)&bi);
         if (pItemIDList && ptrSHGetPathFromIDList) {
+        if (pItemIDList) {
             ptrSHGetPathFromIDList(pItemIDList, path);
             IMalloc *pMalloc;
+            if (SHGetMalloc(&pMalloc) != NOERROR)
+                result = QString();
+            else {
+            if (ptrSHGetMalloc(&pMalloc) == NOERROR) {
                 pMalloc->Free(pItemIDList);
                 pMalloc->Release();
                 result = QString::fromUtf16((ushort*)path);
+                result = QString::fromWCharArray(path);
+            }
+        } else
+            result = QString();
+        }
+    }
     tTitle = QString();
-#endif
     QApplicationPrivate::leaveModal(&modal_widget);
     qt_win_eatMouseMove();
-    // Due to a bug on Windows Me, we need to reset the current
-    // directory
-    if ((QSysInfo::WindowsVersion == QSysInfo::WV_98 || QSysInfo::WindowsVersion == QSysInfo::WV_Me)
-        && QDir::currentPath() != currentDir)
-        QDir::setCurrent(currentDir);
     if (!result.isEmpty())
         result.replace(QLatin1String("\\"), QLatin1String("/"));
+        result.replace(QLatin1Char('\\'), QLatin1Char('/'));
     return result;
+}

trunk/src/gui/dialogs/qfileinfogatherer.cpp

-              r172
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qdiriterator.h>
 #ifndef Q_OS_WIN
+#include <unistd.h>
+#include <sys/types.h>
+#  include <unistd.h>
+#  include <sys/types.h>
+#endif
+#if defined(Q_OS_VXWORKS)
+#  include "qplatformdefs.h"
 #endif
 …
 #ifndef QT_NO_FILESYSTEMWATCHER
     watcher = new QFileSystemWatcher(this);
     connect(watcher, SIGNAL(directoryChanged(const QString &)), this, SLOT(list(const QString &)));
     connect(watcher, SIGNAL(fileChanged(const QString &)), this, SLOT(updateFile(const QString &)));
+    connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(list(QString)));
+    connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(updateFile(QString)));
 #endif
     start(LowPriority);
 …
 QFileInfoGatherer::~QFileInfoGatherer()
+{
     mutex.lock();
+    QMutexLocker locker(&mutex);
     abort = true;
     condition.wakeOne();
     mutex.unlock();
+    locker.unlock();
     wait();
+}
 …
     Q_UNUSED(enable);
 #ifdef Q_OS_WIN
     mutex.lock();
+    QMutexLocker locker(&mutex);
     m_resolveSymlinks = enable;
-    mutex.unlock();
 #endif
+}
 …
 void QFileInfoGatherer::setIconProvider(QFileIconProvider *provider)
+{
     mutex.lock();
+    QMutexLocker locker(&mutex);
     m_iconProvider = provider;
-    mutex.unlock();
+}
 …
 void QFileInfoGatherer::fetchExtendedInformation(const QString &path, const QStringList &files)
+{
     mutex.lock();
+    QMutexLocker locker(&mutex);
     // See if we already have this dir/file in our que
     int loc = this->path.lastIndexOf(path);
     while (loc > 0)  {
         if (this->files.at(loc) == files) {
-            mutex.unlock();
             return;
+        }
 …
     this->files.push(files);
     condition.wakeAll();
-    mutex.unlock();
+}
 …
+{
 #ifndef QT_NO_FILESYSTEMWATCHER
     mutex.lock();
+    QMutexLocker locker(&mutex);
     watcher->removePaths(watcher->files());
     watcher->removePaths(watcher->directories());
-    mutex.unlock();
 #endif
+}
 …
+{
 #ifndef QT_NO_FILESYSTEMWATCHER
     mutex.lock();
+    QMutexLocker locker(&mutex);
     watcher->removePath(path);
-    mutex.unlock();
 #endif
+}
 …
     forever {
         bool updateFiles = false;
         mutex.lock();
+        QMutexLocker locker(&mutex);
         if (abort) {
-            mutex.unlock();
             return;
+        }
 …
             updateFiles = true;
+        }
+        mutex.unlock();
+        if (updateFiles) getFileInfos(path, list);
+        locker.unlock();
+        if (updateFiles)
+            getFileInfos(path, list);
+    }
+}
 …
     if (driveName.startsWith(QLatin1Char('/'))) // UNC host
         return drive.fileName();
+#endif
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
     if (driveName.endsWith(QLatin1Char('/')))
         driveName.chop(1);

trunk/src/gui/dialogs/qfileinfogatherer_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QMutex mutex;
     QWaitCondition condition;
     bool abort;
+    volatile bool abort;
     QStack<QString> path;

trunk/src/gui/dialogs/qfilesystemmodel.cpp

-              r173
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #ifdef Q_OS_WIN
 #include <windows.h>
+#include <qt_windows.h>
 #endif
 …
                 QString longSection = QDir::toNativeSeparators(section);
 #endif
+                QT_WA({
+                    WIN32_FIND_DATAW findData;
+                    h = ::FindFirstFileW((wchar_t *)longSection.utf16(), &findData);
+                    if (h != INVALID_HANDLE_VALUE)
+                        longPath.append(QString::fromUtf16((ushort*)findData.cFileName));
+                    } , {
+                    WIN32_FIND_DATAA findData;
+                    h = ::FindFirstFileA(section.toLocal8Bit(), &findData);
+                    if (h != INVALID_HANDLE_VALUE)
+                        longPath.append(QString::fromLocal8Bit(findData.cFileName));
+                });
+                if (h == INVALID_HANDLE_VALUE) {
+                WIN32_FIND_DATA findData;
+                h = ::FindFirstFile((wchar_t*)longSection.utf16(), &findData);
+                if (h != INVALID_HANDLE_VALUE) {
+                    longPath.append(QString::fromWCharArray(findData.cFileName));
+                    ::FindClose(h);
+                } else {
                     longPath.append(section);
                     break;
-                } else {
-                    ::FindClose(h);
+                }
+            }
 …
     Q_Q(const QFileSystemModel);
     Q_UNUSED(q);
     if (path.isEmpty() || path == myComputer() || path.startsWith(QLatin1String(":")))
+    if (path.isEmpty() || path == myComputer() || path.startsWith(QLatin1Char(':')))
         return const_cast<QFileSystemModelPrivate::QFileSystemNode*>(&root);
 …
     QStringList pathElements = absolutePath.split(QLatin1Char('/'), QString::SkipEmptyParts);
     if ((pathElements.isEmpty())
 #if !defined(Q_OS_OS2) && (!defined(Q_OS_WIN) || defined(Q_OS_WINCE))
+#if (!defined(Q_OS_WIN) || defined(Q_OS_WINCE)) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_OS2)
         && QDir::fromNativeSeparators(longPath) != QLatin1String("/")
 #endif
 …
         index = q->index(r, 0, QModelIndex());
         pathElements.pop_front();
+    } else {
+        if (!pathElements.at(0).contains(QLatin1String(":")))
+            pathElements.prepend(QDir(longPath).rootPath());
+    } else
+#endif
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN)
+    {
+        if (!pathElements.at(0).contains(QLatin1String(":"))) {
+            // The reason we express it like this instead of with anonymous, temporary
+            // variables, is to workaround a compiler crash with Q_CC_NOKIAX86.
+            QString rootPath = QDir(longPath).rootPath();
+            pathElements.prepend(rootPath);
+        }
         if (pathElements.at(0).endsWith(QLatin1Char('/')))
             pathElements[0].chop(1);
 …
             return pixmap;
+        }
+        break;
     case Qt::TextAlignmentRole:
         return Qt::AlignLeft;
 …
 void QFileSystemModelPrivate::sortChildren(int column, const QModelIndex &parent)
+{
+    Q_Q(QFileSystemModel);
     QFileSystemModelPrivate::QFileSystemNode *indexNode = node(parent);
     if (indexNode->children.count() == 0)
 …
     // First update the new visible list
     indexNode->visibleChildren.clear();
+    //No more dirty item we reset our internal dirty index
+    indexNode->dirtyChildrenIndex = -1;
     for (int i = 0; i < values.count(); ++i) {
         indexNode->visibleChildren.append(values.at(i).first->fileName);
         values.at(i).first->isVisible = true;
+    }
+    if (!disableRecursiveSort) {
+        for (int i = 0; i < q->rowCount(parent); ++i) {
+            const QModelIndex childIndex = q->index(i, 0, parent);
+            QFileSystemModelPrivate::QFileSystemNode *indexNode = node(childIndex);
+            //Only do a recursive sort on visible nodes
+            if (indexNode->isVisible)
+                sortChildren(column, childIndex);
+        }
+    }
+}
 …
     Q_D(QFileSystemModel);
     d->fileInfoGatherer.setIconProvider(provider);
     qApp->processEvents();
+    QApplication::processEvents();
     d->root.updateIcon(provider, QString());
+}
 …
         return;
     QStringList toRemove;
+#if defined(Q_OS_SYMBIAN)
+    // Filename case must be exact in qBinaryFind below, so create a list of all lowercase names.
+    QStringList newFiles;
+    for(int i = 0; i < files.size(); i++) {
+        newFiles << files.at(i).toLower();
+    }
+#else
     QStringList newFiles = files;
+#endif
     qSort(newFiles.begin(), newFiles.end());
     QHash<FileNameKey, QFileSystemNode*>::const_iterator i = parentNode->children.constBegin();
     while (i != parentNode->children.constEnd()) {
         QStringList::iterator iterator;
+        iterator = qBinaryFind(newFiles.begin(), newFiles.end(), i.value()->fileName);
+        iterator = qBinaryFind(newFiles.begin(), newFiles.end(),
+#if defined(Q_OS_SYMBIAN)
+                    i.value()->fileName.toLower());
+#else
+                    i.value()->fileName);
+#endif
         if (iterator == newFiles.end()) {
             toRemove.append(i.value()->fileName);
 …
         q->beginInsertRows(parent, parentNode->visibleChildren.count() , parentNode->visibleChildren.count() + newFiles.count() - 1);
+    }
+    if (parentNode->dirtyChildrenIndex == -1)
+        parentNode->dirtyChildrenIndex = parentNode->visibleChildren.count();
     for (int i = 0; i < newFiles.count(); ++i) {
             parentNode->visibleChildren.append(newFiles.at(i));
 …
     Q_Q(QFileSystemModel);
     qRegisterMetaType<QList<QPair<QString,QFileInfo> > >("QList<QPair<QString,QFileInfo> >");
     q->connect(&fileInfoGatherer, SIGNAL(newListOfFiles(const QString &, const QStringList &)),
                q, SLOT(_q_directoryChanged(const QString &, const QStringList &)));
     q->connect(&fileInfoGatherer, SIGNAL(updates(const QString &, const QList<QPair<QString, QFileInfo> > &)),
             q, SLOT(_q_fileSystemChanged(const QString &, const QList<QPair<QString, QFileInfo> > &)));
     q->connect(&fileInfoGatherer, SIGNAL(nameResolved(const QString &, const QString &)),
             q, SLOT(_q_resolvedName(const QString &, const QString &)));
+    q->connect(&fileInfoGatherer, SIGNAL(newListOfFiles(QString,QStringList)),
+               q, SLOT(_q_directoryChanged(QString,QStringList)));
+    q->connect(&fileInfoGatherer, SIGNAL(updates(QString,QList<QPair<QString,QFileInfo> >)),
+            q, SLOT(_q_fileSystemChanged(QString,QList<QPair<QString,QFileInfo> >)));
+    q->connect(&fileInfoGatherer, SIGNAL(nameResolved(QString,QString)),
+            q, SLOT(_q_resolvedName(QString,QString)));
     q->connect(&delayedSortTimer, SIGNAL(timeout()), q, SLOT(_q_performDelayedSort()), Qt::QueuedConnection);
+}
 …
+}
+QT_END_NAMESPACE
 #include "moc_qfilesystemmodel.cpp"
 #endif // QT_NO_FILESYSTEMMODEL
-QT_END_NAMESPACE

trunk/src/gui/dialogs/qfilesystemmodel.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_PRIVATE_SLOT(d_func(), void _q_fileSystemChanged(const QString &path, const QList<QPair<QString, QFileInfo> > &))
     Q_PRIVATE_SLOT(d_func(), void _q_resolvedName(const QString &fileName, const QString &resolvedName))
+    friend class QFileDialogPrivate;
 };

trunk/src/gui/dialogs/qfilesystemmodel_p.h

-              r173
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     public:
         QFileSystemNode(const QString &filename = QString(), QFileSystemNode *p = 0)
             : fileName(filename), populatedChildren(false), isVisible(false), parent(p), info(0) {}
+            : fileName(filename), populatedChildren(false), isVisible(false), dirtyChildrenIndex(-1), parent(p), info(0) {}
         ~QFileSystemNode() {
             QHash<FileNameKey, QFileSystemNode*>::const_iterator i = children.constBegin();
 …
             QHash<FileNameKey, QFileSystemNode *>::const_iterator iterator;
             for(iterator = children.constBegin() ; iterator != children.constEnd() ; ++iterator) {
+                iterator.value()->updateIcon(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName);
+                //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/)
+                if (!path.isEmpty()) {
+                    if (path.endsWith(QLatin1Char('/')))
+                        iterator.value()->updateIcon(iconProvider, path + iterator.value()->fileName);
+                    else
+                        iterator.value()->updateIcon(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName);
+                } else
+                    iterator.value()->updateIcon(iconProvider, iterator.value()->fileName);
+            }
+        }
 …
             QHash<FileNameKey, QFileSystemNode *>::const_iterator iterator;
             for(iterator = children.constBegin() ; iterator != children.constEnd() ; ++iterator) {
+                 iterator.value()->retranslateStrings(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName);
+                //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/)
+                if (!path.isEmpty()) {
+                    if (path.endsWith(QLatin1Char('/')))
+                        iterator.value()->retranslateStrings(iconProvider, path + iterator.value()->fileName);
+                    else
+                        iterator.value()->retranslateStrings(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName);
+                } else
+                    iterator.value()->retranslateStrings(iconProvider, iterator.value()->fileName);
+            }
+        }
 …
         QHash<FileNameKey, QFileSystemNode *> children;
         QList<QString> visibleChildren;
+        int dirtyChildrenIndex;
         QFileSystemNode *parent;
 …
             setRootPath(false),
             filters(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs),
+            nameFilterDisables(true) // false on windows, true on mac and unix
+            nameFilterDisables(true), // false on windows, true on mac and unix
+            disableRecursiveSort(false)
+    {
         delayedSortTimer.setSingleShot(true);
 …
     inline int translateVisibleLocation(QFileSystemNode *parent, int row) const {
+        return (sortOrder == Qt::AscendingOrder) ? row : parent->visibleChildren.count() - row - 1;
+        if (sortOrder == Qt::AscendingOrder)
+                return row;
+        if (parent->dirtyChildrenIndex == -1 || row < parent->dirtyChildrenIndex)
+            if (parent->dirtyChildrenIndex != -1)
+                return parent->dirtyChildrenIndex - row - 1;
+            else
+                return parent->visibleChildren.count() - row - 1;
+        else
+            return row;
+    }
 …
     QHash<const QFileSystemNode*, bool> bypassFilters;
     bool nameFilterDisables;
+    //This flag is an optimization for the QFileDialog
+    //It enable a sort which is not recursive, it means
+    //we sort only what we see.
+    bool disableRecursiveSort;
 #ifndef QT_NO_REGEXP
     QList<QRegExp> nameFilters;

trunk/src/gui/dialogs/qfontdialog.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <private/qfont_p.h>
+#if defined(Q_WS_S60)
+#include <QtGui/qdesktopwidget.h>
+#endif
 QT_BEGIN_NAMESPACE
 …
 /*!
   \class QFontDialog
+  \ingroup dialogs
+  \ingroup text
+  \mainclass
+  \ingroup standard-dialogs
   \brief The QFontDialog class provides a dialog widget for selecting a font.
 …
     QObject::connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject()));
 #if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
     q->resize(180, 120);
+#elif defined(Q_WS_S60)
+    q->resize(QApplication::desktop()->availableGeometry(QCursor::pos()).size());
 #else
     q->resize(500, 360);
 #endif // Q_OS_WINCE
+#endif // Q_WS_WINCE
     sizeEdit->installEventFilter(q);
 …
 QFontDialog::~QFontDialog()
+{
+#ifdef Q_WS_MAC
+    Q_D(QFontDialog);
+    if (d->delegate) {
+        QFontDialogPrivate::closeCocoaFontPanel(d->delegate);
+        QFontDialogPrivate::sharedFontPanelAvailable = true;
+        return;
+    }
+#endif
+}
 …
     Q_Q(QFontDialog);
-    familyList->blockSignals(true);
     enum match_t { MATCH_NONE = 0, MATCH_LAST_RESORT = 1, MATCH_APP = 2, MATCH_FAMILY = 3 };
 …
         familyEdit->selectAll();
-    familyList->blockSignals(false);
     updateStyles();
+}
 …
+{
     Q_Q(QFontDialog);
-    styleList->blockSignals(true);
     QStringList styles = fdb.styles(familyList->currentText());
     styleList->model()->setStringList(styles);
 …
             if (!found)
                 styleList->setCurrentItem(0);
+        } else {
+            styleList->setCurrentItem(0);
+        }
 …
+    }
-    styleList->blockSignals(false);
     updateSizes();
+}
 …
+{
     Q_Q(QFontDialog);
-    sizeList->blockSignals(true);
     if (!familyList->currentText().isEmpty()) {
 …
+    }
-    sizeList->blockSignals(false);
     _q_updateSample();
+}
 …
     styleAccel->setText(QFontDialog::tr("Font st&yle"));
     sizeAccel->setText(QFontDialog::tr("&Size"));
+#ifndef Q_WS_S60
+    // Removed the title due to lack of screen estate in small S60 screen.
+    // The effects are descriptive without a title (strikeout, underline).
     effects->setTitle(QFontDialog::tr("Effects"));
+#endif
     strikeout->setText(QFontDialog::tr("Stri&keout"));
     underline->setText(QFontDialog::tr("&Underline"));
 …
     \property QFontDialog::currentFont
     \brief the current font of the dialog.
 */
+*/
 /*!
 …
 #ifdef Q_WS_MAC
     if (d->delegate)
+    if (d->delegate)
         QFontDialogPrivate::setFont(d->delegate, font);
 #endif
 …
     \overload
     Opens the dialog and connects its accepted() signal to the slot specified
+    Opens the dialog and connects its fontSelected() signal to the slot specified
     by \a receiver and \a member.
 …
+{
     Q_D(QFontDialog);
     connect(this, SIGNAL(fontSelected(const QFont&)), receiver, member);
+    connect(this, SIGNAL(fontSelected(QFont)), receiver, member);
     d->receiverToDisconnectOnClose = receiver;
     d->memberToDisconnectOnClose = member;
 …
+    }
     if (d->receiverToDisconnectOnClose) {
         disconnect(this, SIGNAL(fontSelected(const QFont&)),
+        disconnect(this, SIGNAL(fontSelected(QFont)),
                    d->receiverToDisconnectOnClose, d->memberToDisconnectOnClose);
         d->receiverToDisconnectOnClose = 0;

trunk/src/gui/dialogs/qfontdialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qfontdialog_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <private/qfont_p.h>
 #include <private/qfontengine_p.h>
+#include <private/qt_cocoa_helpers_mac_p.h>
 #include <private/qt_mac_p.h>
 #include <qdebug.h>
 …
 #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
+@protocol NSWindowDelegate <NSObject> @end
+@protocol NSWindowDelegate <NSObject>
+- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize;
+@end
 #endif
 …
     NSButton *mCancelButton;
     QFontDialogPrivate *mPriv;
-    NSFont *mCocoaFont;
     QFont *mQtFont;
     BOOL mPanelHackedWithButtons;
 …
 @end
+static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont)
+{
+    QFont newFont;
+    if (cocoaFont) {
+        int pSize = qRound([cocoaFont pointSize]);
+        QString family(qt_mac_NSStringToQString([cocoaFont familyName]));
+        QString typeface(qt_mac_NSStringToQString([cocoaFont fontName]));
+        int hyphenPos = typeface.indexOf(QLatin1Char('-'));
+        if (hyphenPos != -1) {
+            typeface.remove(0, hyphenPos + 1);
+        } else {
+            typeface = QLatin1String("Normal");
+        }
+        newFont = QFontDatabase().font(family, typeface, pSize);
+        newFont.setUnderline(resolveFont.underline());
+        newFont.setStrikeOut(resolveFont.strikeOut());
+    }
+    return newFont;
+}
 @implementation QCocoaFontPanelDelegate
 - (id)initWithFontPanel:(NSFontPanel *)panel
 …
     mCancelButton = cancelButton;
     mPriv = priv;
-    mCocoaFont = 0;
     mPanelHackedWithButtons = (okButton != 0);
     mDialogExtraWidth = extraWidth;
 …
 - (void)dealloc
+{
-    if (mCocoaFont)
-        [mCocoaFont release];
     delete mQtFont;
     [super dealloc];
 …
 - (void)changeFont:(id)sender
+{
-    Q_UNUSED(sender);
-    QFont newFont;
-    if (mCocoaFont)
-        [mCocoaFont autorelease];
     NSFont *dummyFont = [NSFont userFontOfSize:12.0];
+    mCocoaFont = [sender convertFont:dummyFont];
+    if (mCocoaFont) {
+        [mCocoaFont retain];
+        int pSize = qRound([mCocoaFont pointSize]);
+        QString family(QCFString::toQString(reinterpret_cast<CFStringRef>([mCocoaFont familyName])));
+        QString typeface(QCFString::toQString(reinterpret_cast<CFStringRef>([mCocoaFont fontName])));
+//        qDebug() << "original family" << family << "typeface" << typeface << "psize" << pSize;
+        int hyphenPos = typeface.indexOf(QLatin1Char('-'));
+        if (hyphenPos != -1) {
+            typeface.remove(0, hyphenPos + 1);
+        } else {
+            typeface = QLatin1String("Normal");
+        }
+//        qDebug() << " massaged family" << family << "typeface" << typeface << "psize" << pSize;
+        newFont = QFontDatabase().font(family, typeface, pSize);
+        newFont.setUnderline(mQtFont->underline());
+        newFont.setStrikeOut(mQtFont->strikeOut());
+    }
+    [self setQtFont:newFont];
+    [self setQtFont:qfontForCocoaFont([sender convertFont:dummyFont], *mQtFont)];
     if (mPriv)
         mPriv->updateSampleFont(*mQtFont);
 …
+{
     Q_ASSERT(mPanelHackedWithButtons);
+    NSFontManager *fontManager = [NSFontManager sharedFontManager];
+    [self setQtFont:qfontForCocoaFont([fontManager convertFont:[fontManager selectedFont]],
+                                      *mQtFont)];
     [[mStolenContentView window] close];
     [self finishOffWithCode:NSOKButton];
 …
+        }
-        // temporary hack to work around bug in deleteLater() in Qt/Mac Cocoa
-#if 1
-        bool deleteDialog = mPriv->fontDialog()->testAttribute(Qt::WA_DeleteOnClose);
-        mPriv->fontDialog()->setAttribute(Qt::WA_DeleteOnClose, false);
-#endif
         mPriv->done((code == NSOKButton) ? QDialog::Accepted : QDialog::Rejected);
-#if 1
-        if (deleteDialog)
-            delete mPriv->fontDialog();
-#endif
     } else {
         [NSApp stopModalWithCode:code];
 …
     [mFontPanel setDelegate:nil];
     [[NSFontManager sharedFontManager] setDelegate:nil];
+#ifdef QT_MAC_USE_COCOA
     [[NSFontManager sharedFontManager] setTarget:nil];
+#endif
+}
 @end
 …
     [ourPanel setDelegate:delegate];
     [[NSFontManager sharedFontManager] setDelegate:delegate];
+#ifdef QT_MAC_USE_COCOA
     [[NSFontManager sharedFontManager] setTarget:delegate];
+#endif
     setFont(delegate, initial);
 …
 void QFontDialogPrivate::closeCocoaFontPanel(void *delegate)
+{
+    QMacCocoaAutoReleasePool pool;
     QCocoaFontPanelDelegate *theDelegate = static_cast<QCocoaFontPanelDelegate *>(delegate);
     NSWindow *ourPanel = [theDelegate actualPanel];
 …
+}
+void QFontDialogPrivate::setFont(void * delegate, const QFont &font)
+{
+void QFontDialogPrivate::setFont(void *delegate, const QFont &font)
+{
+    QMacCocoaAutoReleasePool pool;
     QFontEngine *fe = font.d->engineForScript(QUnicodeTables::Common);
+    NSFontManager *mgr = [NSFontManager sharedFontManager];
+    NSFont *nsFont = 0;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
     if (qstrcmp(fe->name(), "CoreText") == 0) {
+        const NSFont *nsFont = reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
+        [[NSFontManager sharedFontManager] setSelectedFont:nsFont isMultiple:NO];
+    }
+#endif
+        nsFont = reinterpret_cast<const NSFont *>(static_cast<QCoreTextFontEngineMulti *>(fe)->ctfont);
+    } else
+#endif
+    {
+        int weight = 5;
+        NSFontTraitMask mask = 0;
+        if (font.style() == QFont::StyleItalic) {
+            mask |= NSItalicFontMask;
+        }
+        if (font.weight() == QFont::Bold) {
+            weight = 9;
+            mask |= NSBoldFontMask;
+        }
+        NSFontManager *mgr = [NSFontManager sharedFontManager];
+        QFontInfo fontInfo(font);
+        nsFont = [mgr fontWithFamily:qt_mac_QStringToNSString(fontInfo.family())
+            traits:mask
+            weight:weight
+            size:fontInfo.pointSize()];
+    }
+    [mgr setSelectedFont:nsFont isMultiple:NO];
     [static_cast<QCocoaFontPanelDelegate *>(delegate) setQtFont:font];
+}

trunk/src/gui/dialogs/qfontdialog_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qinputdialog.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QInputDialogSpinBox(QWidget *parent)
         : QSpinBox(parent) {
         connect(lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(notifyTextChanged()));
+        connect(lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(notifyTextChanged()));
         connect(this, SIGNAL(editingFinished()), this, SLOT(notifyTextChanged()));
+    }
 …
     QInputDialogDoubleSpinBox(QWidget *parent = 0)
         : QDoubleSpinBox(parent) {
         connect(lineEdit(), SIGNAL(textChanged(const QString&)), this, SLOT(notifyTextChanged()));
+        connect(lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(notifyTextChanged()));
         connect(this, SIGNAL(editingFinished()), this, SLOT(notifyTextChanged()));
+    }
 …
         lineEdit = new QLineEdit(q);
         lineEdit->hide();
         QObject::connect(lineEdit, SIGNAL(textChanged(const QString&)),
                          q, SLOT(_q_textChanged(const QString&)));
+        QObject::connect(lineEdit, SIGNAL(textChanged(QString)),
+                         q, SLOT(_q_textChanged(QString)));
+    }
+}
 …
         comboBox = new QComboBox(q);
         comboBox->hide();
         QObject::connect(comboBox, SIGNAL(editTextChanged(const QString&)),
                          q, SLOT(_q_textChanged(const QString&)));
         QObject::connect(comboBox, SIGNAL(currentIndexChanged(const QString&)),
                          q, SLOT(_q_textChanged(const QString&)));
+        QObject::connect(comboBox, SIGNAL(editTextChanged(QString)),
+                         q, SLOT(_q_textChanged(QString)));
+        QObject::connect(comboBox, SIGNAL(currentIndexChanged(QString)),
+                         q, SLOT(_q_textChanged(QString)));
+    }
+}
 …
         listView->setCurrentIndex(QModelIndex()); // ###
         QObject::connect(listView->selectionModel(),
                          SIGNAL(currentRowChanged(const QModelIndex&, const QModelIndex&)),
                          q, SLOT(_q_currentRowChanged(const QModelIndex&, const QModelIndex&)));
+                         SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
+                         q, SLOT(_q_currentRowChanged(QModelIndex,QModelIndex)));
+    }
+}
 …
     if (spinBox) {
         QAbstractButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
+        QObject::disconnect(spinBox, SIGNAL(textChanged(bool)), okButton, SLOT(setEnabled(bool)));
+        QObject::connect(spinBox, SIGNAL(textChanged(bool)), okButton, SLOT(setEnabled(bool)));
+        QObject::connect(spinBox, SIGNAL(textChanged(bool)), okButton, SLOT(setEnabled(bool)), Qt::UniqueConnection);
+    }
+}
 …
     \brief The QInputDialog class provides a simple convenience dialog to get a
     single value from the user.
     \ingroup dialogs
+    \mainclass
+    \ingroup standard-dialogs
     The input value can be a string, a number or an item from a list. A label
 …
     \overload
+    Opens the dialog and connects its accepted() signal to the slot specified
+    by \a receiver and \a member.
+    This function connects one of its signals to the slot specified by \a receiver
+    and \a member. The specific signal depends on the arguments that are specified
+    in \a member. These are:
+    \list
+      \o textValueSelected() if \a member has a QString for its first argument.
+      \o intValueSelected() if \a member has an int for its first argument.
+      \o doubleValueSelected() if \a member has a double for its first argument.
+      \o accepted() if \a member has NO arguments.
+    \endlist
     The signal will be disconnected from the slot when the dialog is closed.
 …
     \a flags.
     This function returns the text which has been entered in the line
     edit. It will not return an empty string.
+    If the dialog is accepted, this function returns the text in the dialog's
+    line edit. If the dialog is rejected, a null QString is returned.
     Use this static function like this:
 …
         return dialog.textValue();
     } else {
         return text;
+        return QString();
+    }
+}
 …
     dialog.setWindowTitle(title);
     dialog.setLabelText(label);
+    dialog.setDoubleDecimals(decimals);
     dialog.setDoubleRange(min, max);
     dialog.setDoubleValue(value);
-    dialog.setDoubleDecimals(decimals);
     int ret = dialog.exec();

trunk/src/gui/dialogs/qinputdialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qmessagebox.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <QtGui/qdialogbuttonbox.h>
 #include "private/qlabel_p.h"
+#include "private/qapplication_p.h"
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>
 …
 #include <QtGui/qclipboard.h>
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 extern bool qt_wince_is_mobile();    //defined in qguifunctions_wince.cpp
 extern bool qt_wince_is_smartphone();//defined in qguifunctions_wince.cpp
 …
 QT_BEGIN_NAMESPACE
-extern QHash<QByteArray, QFont> *qt_app_fonts_hash();
 enum Button { Old_Ok = 1, Old_Cancel = 2, Old_Yes = 3, Old_No = 4, Old_Abort = 5, Old_Retry = 6,
 …
     void retranslateStrings();
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     void hideSpecial();
 #endif
 …
     QAbstractButton *detectedEscapeButton;
     QLabel *informativeLabel;
+#ifdef Q_OS_SYMBIAN
+    QTextEdit *textEdit;
+#endif
     QPointer<QObject> receiverToDisconnectOnClose;
     QByteArray memberToDisconnectOnClose;
 …
 int QMessageBoxPrivate::layoutMinimumWidth()
+{
+    Q_Q(QMessageBox);
+    q->layout()->activate();
+    return q->layout()->totalMinimumSize().width();
+    layout->activate();
+    return layout->totalMinimumSize().width();
+}
 …
     QSize screenSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size();
+#ifdef Q_WS_QWS
+    // the width of the screen, less the window border.
+    int hardLimit = screenSize.width() - (q->frameGeometry().width() - q->geometry().width());
+#elif defined(Q_OS_WINCE)
+#if defined(Q_WS_QWS) || defined(Q_WS_WINCE) || defined(Q_OS_SYMBIAN)
     // the width of the screen, less the window border.
     int hardLimit = screenSize.width() - (q->frameGeometry().width() - q->geometry().width());
 #else
     int hardLimit = qMin(screenSize.width() - 480, 1000); // can never get bigger than this
+    // on small screens allows the messagebox be the same size as the screen
+    if (screenSize.width() <= 1024)
+        hardLimit = screenSize.width();
 #endif
 #ifdef Q_WS_MAC
 …
 #else
     // note: ideally on windows, hard and soft limits but it breaks compat
 #ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     int softLimit = qMin(screenSize.width()/2, 500);
 #else
     int softLimit = qMin(screenSize.width() * 3 / 4, 500);
 #endif //Q_OS_WINCE
+#endif //Q_WS_WINCE
 #endif
 …
             width = hardLimit;
+        }
+#ifdef Q_WS_S60
+        // in S60 portait messageBoxes should always occupy maximum width
+        if (QApplication::desktop()->size().height() > QApplication::desktop()->size().width()){
+            width = hardLimit;
+        } else {
+            // in landscape the messageBoxes should be of same width as in portrait
+            width = qMin(QApplication::desktop()->size().height(), hardLimit);
+        }
+#endif
+    }
 …
+    }
     QFontMetrics fm(qApp->font("QWorkspaceTitleBar"));
+    QFontMetrics fm(QApplication::font("QWorkspaceTitleBar"));
     int windowTitleWidth = qMin(fm.width(q->windowTitle()) + 50, hardLimit);
     if (windowTitleWidth > width)
         width = windowTitleWidth;
     q->layout()->activate();
     int height = (q->layout()->hasHeightForWidth())
                      ? q->layout()->totalHeightForWidth(width)
                      : q->layout()->totalMinimumSize().height();
+    layout->activate();
+    int height = (layout->hasHeightForWidth())
+                     ? layout->totalHeightForWidth(width)
+                     : layout->totalMinimumSize().height();
     q->setFixedSize(width, height);
     QCoreApplication::removePostedEvents(q, QEvent::LayoutRequest);
 …
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 /*!
   \internal
 …
             QString text = pb->text();
             text.remove(QChar::fromLatin1('&'));
             if (text == qApp->translate("QMessageBox", "OK" ))
+            if (text == QApplication::translate("QMessageBox", "OK" ))
                 pb->setFixedSize(0,0);
+        }
 …
     the user or for asking the user a question and receiving an answer.
     \ingroup dialogs
+    \mainclass
+    \ingroup standard-dialogs
     A message box displays a primary \l{QMessageBox::text}{text} to
 …
     passed to the QDialog constructor.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    On Mac OS X, if \a parent is not 0 and you want your message box
+    to appear as a Qt::Sheet of that parent, set the message box's
+    \l{setWindowModality()} {window modality} to Qt::WindowModal
+    (default). Otherwise, the message box will be a standard dialog.
+    On Mac OS X, if you want your message box to appear
+    as a Qt::Sheet of its \a parent, set the message box's
+    \l{setWindowModality()} {window modality} to Qt::WindowModal or use open().
+    Otherwise, the message box will be a standard dialog.
 */
 …
             d_func()->retranslateStrings();
             break;
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
         case QEvent::OkRequest:
         case QEvent::HelpRequest: {
           QString bName =
               (e->type() == QEvent::OkRequest)
               ? qApp->translate("QMessageBox", "OK")
               : qApp->translate("QMessageBox", "Help");
+              ? QApplication::translate("QMessageBox", "OK")
+              : QApplication::translate("QMessageBox", "Help");
           QList<QPushButton*> list = qFindChildren<QPushButton*>(this);
           for (int i=0; i<list.size(); ++i) {
 …
             QString separator = QString::fromLatin1("---------------------------\n");
             QString textToCopy = separator;
             separator.prepend(QLatin1String("\n"));
+            separator.prepend(QLatin1Char('\n'));
             textToCopy += windowTitle() + separator; // title
             textToCopy += d->label->text() + separator; // text
 …
             textToCopy += buttonTexts + separator;
             qApp->clipboard()->setText(textToCopy);
+            QApplication::clipboard()->setText(textToCopy);
             return;
+        }
 …
+}
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 /*!
     \reimp
 …
     \overload
+    Opens the dialog and connects its accepted() signal to the slot specified
+    by \a receiver and \a member.
+    Opens the dialog and connects its finished() or buttonClicked() signal to
+    the slot specified by \a receiver and \a member. If the slot in \a member
+    has a pointer for its first parameter the connection is to buttonClicked(),
+    otherwise the connection is to finished().
     The signal will be disconnected from the slot when the dialog is closed.
 …
     if (d->autoAddOkButton) {
         addButton(Ok);
 #if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
         d->hideSpecial();
 #endif
 …
 #endif
     QString translatedTextAboutQt;
     translatedTextAboutQt = QMessageBox::tr(
+    QString translatedTextAboutQtCaption;
+    translatedTextAboutQtCaption = QMessageBox::tr(
         "<h3>About Qt</h3>"
         "<p>This program uses Qt version %1.</p>"
+        ).arg(QLatin1String(QT_VERSION_STR));
+    QString translatedTextAboutQtText;
+    translatedTextAboutQtText = QMessageBox::tr(
         "<p>Qt is a C++ toolkit for cross-platform application "
         "development.</p>"
 …
         "<p>Qt is available under three different licensing options designed "
         "to accommodate the needs of our various users.</p>"
         "Qt licensed under our commercial license agreement is appropriate "
+        "<p>Qt licensed under our commercial license agreement is appropriate "
         "for development of proprietary/commercial software where you do not "
         "want to share any source code with third parties or otherwise cannot "
 …
         "terms of the GNU GPL version 3.0 or where you are otherwise willing "
         "to comply with the terms of the GNU GPL version 3.0.</p>"
         "<p>Please see <a href=\"http://www.qtsoftware.com/products/licensing\">www.qtsoftware.com/products/licensing</a> "
+        "<p>Please see <a href=\"http://qt.nokia.com/products/licensing\">qt.nokia.com/products/licensing</a> "
         "for an overview of Qt licensing.</p>"
         "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
         "<p>Qt is a Nokia product. See <a href=\"http://www.qtsoftware.com/qt/\">www.qtsoftware.com/qt</a> "
+        "<p>Qt is a Nokia product. See <a href=\"http://qt.nokia.com/\">qt.nokia.com</a> "
         "for more information.</p>"
+       ).arg(QLatin1String(QT_VERSION_STR));
+        );
     QMessageBox *msgBox = new QMessageBox(parent);
     msgBox->setAttribute(Qt::WA_DeleteOnClose);
     msgBox->setWindowTitle(title.isEmpty() ? tr("About Qt") : title);
+    msgBox->setText(translatedTextAboutQt);
+    msgBox->setText(translatedTextAboutQtCaption);
+    msgBox->setInformativeText(translatedTextAboutQtText);
     QPixmap pm(QLatin1String(":/trolltech/qmessagebox/images/qtlogo-64.png"));
     if (!pm.isNull())
         msgBox->setIconPixmap(pm);
 #if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
     msgBox->setDefaultButton(msgBox->addButton(QMessageBox::Ok));
 #endif
 …
         label->setWordWrap(true);
         QGridLayout *grid = static_cast<QGridLayout *>(layout());
+#ifdef Q_OS_SYMBIAN
+        label->hide();
+        QTextEdit *textEdit = new QTextEdit(this);
+        textEdit->setReadOnly(true);
+        grid->addWidget(textEdit, 1, 1, 1, 1);
+        d->textEdit = textEdit;
+#else
         grid->addWidget(label, 1, 1, 1, 1);
+#endif
         d->informativeLabel = label;
+    }
     d->informativeLabel->setText(text);
+#ifdef Q_OS_SYMBIAN
+    //We need to put the informative label inside textEdit to enable scrolling of long texts.
+    d->textEdit->setText(d->informativeLabel->text());
+#endif
     d->updateSize();
+}

trunk/src/gui/dialogs/qmessagebox.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     void removeButton(QAbstractButton *button);
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     void setVisible(bool visible);
 #endif
 …
          const QString &text, StandardButtons buttons = Ok,
          StandardButton defaultButton = NoButton);
+    // ### Qt 5: Replace Ok with Yes|No in question() function.
+    //     Also consider if Ok == Yes and Cancel == No.
     static StandardButton question(QWidget *parent, const QString &title,
          const QString &text, StandardButtons buttons = Ok,

trunk/src/gui/dialogs/qnspanelproxy_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
+    {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+        // The following code replaces the _implementation_ for the selector we want to hack
+        // (originalSel) with the implementation found in proxyClass. Then it creates
+        // a new 'backup' method inside baseClass containing the old, original,
+        // implementation (fakeSel). You can let the proxy implementation of originalSel
+        // call fakeSel if needed (similar approach to calling a super class implementation).
+        // fakeSel must also be implemented in proxyClass, as the signature is used
+        // as template for the method one we add into baseClass.
+        // NB: You will typically never create any instances of proxyClass; we use it
+        // only for stealing its contents and put it into baseClass.
         Method originalMethod = class_getInstanceMethod(baseClass, originalSel);
         Method newMethod = class_getInstanceMethod(proxyClass, originalSel);
         Method fakeMethod = class_getInstanceMethod(proxyClass, fakeSel);
+        IMP originalCtorImp = method_setImplementation(originalMethod,
+                                                       method_getImplementation(newMethod));
+        class_addMethod(baseClass, fakeSel, originalCtorImp,
+                        method_getTypeEncoding(fakeMethod));
+        IMP originalImp = method_setImplementation(originalMethod, method_getImplementation(newMethod));
+        class_addMethod(baseClass, fakeSel, originalImp, method_getTypeEncoding(fakeMethod));
 #endif
+    }

trunk/src/gui/dialogs/qpagesetupdialog.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QT_BEGIN_NAMESPACE
+/*!
+    \class QPageSetupDialog
+    \brief The QPageSetupDialog class provides a configuration dialog
+    for the page-related options on a printer.
+    \ingroup standard-dialogs
+    \ingroup printing
+    On Windows and Mac OS X the page setup dialog is implemented using
+    the native page setup dialogs.
+    Note that on Windows and Mac OS X custom paper sizes won't be
+    reflected in the native page setup dialogs. Additionally, custom
+    page margins set on a QPrinter won't show in the native Mac OS X
+    page setup dialog.
+    \sa QPrinter, QPrintDialog
+*/
+/*!
+    \fn QPageSetupDialog::QPageSetupDialog(QPrinter *printer, QWidget *parent)
+    Constructs a page setup dialog that configures \a printer with \a
+    parent as the parent widget.
+*/
+/*!
+    \since 4.5
+    \fn QPageSetupDialog::QPageSetupDialog(QWidget *parent)
+    Constructs a page setup dialog that configures a default-constructed
+    QPrinter with \a parent as the parent widget.
+    \sa printer()
+*/
+/*!
+    \fn QPrinter *QPageSetupDialog::printer()
+    Returns the printer that was passed to the QPageSetupDialog
+    constructor.
+*/
 // hack
 …
+}
+#if defined(Q_WS_MAC) || defined(Q_OS_WIN)
+/*! \fn void QPageSetupDialog::setVisible(bool visible)
+    \reimp
+*/
+#endif
 QT_END_NAMESPACE

trunk/src/gui/dialogs/qpagesetupdialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qpagesetupdialog_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
+}
-/*!
-    \reimp
-*/
 void QPageSetupDialog::setVisible(bool visible)
+{

trunk/src/gui/dialogs/qpagesetupdialog_unix.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qpagesetupdialog_unix_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qpagesetupdialog_win.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QWin32PrintEngine *engine = static_cast<QWin32PrintEngine*>(d->printer->paintEngine());
     QWin32PrintEnginePrivate *ep = static_cast<QWin32PrintEnginePrivate *>(engine->d_ptr);
+    QWin32PrintEnginePrivate *ep = static_cast<QWin32PrintEnginePrivate *>(engine->d_ptr.data());
     PAGESETUPDLG psd;
 …
     // we need a temp DEVMODE struct if we don't have a global DEVMODE
     HGLOBAL hDevMode;
     int devModeSize;
+    HGLOBAL hDevMode = 0;
+    int devModeSize = 0;
     if (!ep->globalDevMode) {
+        QT_WA( { devModeSize = sizeof(DEVMODEW) + ((DEVMODEW *) ep->devMode)->dmDriverExtra; },
+               { devModeSize = sizeof(DEVMODEA) + ((DEVMODEA *) ep->devMode)->dmDriverExtra; });
+        devModeSize = sizeof(DEVMODE) + ep->devMode->dmDriverExtra;
         hDevMode = GlobalAlloc(GHND, devModeSize);
         if (hDevMode) {
 …
     QWidget *parent = parentWidget();
     parent = parent ? parent->window() : qApp->activeWindow();
+    parent = parent ? parent->window() : QApplication::activeWindow();
     Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created));
     psd.hwndOwner = parent ? parent->winId() : 0;

trunk/src/gui/dialogs/qprintdialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qprintdialog_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QT_USE_NAMESPACE
+#ifdef QT_MAC_USE_COCOA
 @class QCocoaPrintPanelDelegate;
 …
         // Keep us in sync with file output
         PMDestinationType dest;
+        // If the user selected print to file, the session has been
+        // changed behind our back and our d->ep->session object is a
+        // dangling pointer. Update it based on the "current" session
+        d->ep->session = static_cast<PMPrintSession>([d->ep->printInfo PMPrintSession]);
         PMSessionGetDestinationType(d->ep->session, d->ep->settings, &dest);
         if (dest == kPMDestinationFile) {
 …
+}
 @end
+#endif
 QT_BEGIN_NAMESPACE

trunk/src/gui/dialogs/qprintdialog_unix.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "private/qabstractprintdialog_p.h"
-#include "qfiledialog_p.h"
 #include <QtGui/qmessagebox.h>
 #include "qprintdialog.h"
 #include "qfiledialog.h"
 #include <QtCore/qdir.h>
+#include <QtGui/qevent.h>
 #include <QtGui/qfilesystemmodel.h>
 #include <QtGui/qstyleditemdelegate.h>
 …
 #include <QtGui/qdialogbuttonbox.h>
+#include "qfscompleter_p.h"
 #include "ui_qprintpropertieswidget.h"
 #include "ui_qprintsettingsoutput.h"
 …
           selected(-1),
           selDescription(0),
           parentItem(pi) {};
+          parentItem(pi) {}
     ~QOptionTreeItem() {
         while (!childItems.isEmpty())
             delete childItems.takeFirst();
     };
+    }
     ItemType type;
 …
     Q_OBJECT
 public:
     QPPDOptionsEditor(QObject* parent = 0) : QStyledItemDelegate(parent) {};
     ~QPPDOptionsEditor() {};
+    QPPDOptionsEditor(QObject* parent = 0) : QStyledItemDelegate(parent) {}
+    ~QPPDOptionsEditor() {}
     QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
 …
             QString printerName(QString::fromLocal8Bit(cupsPrinters[i].name));
             if (cupsPrinters[i].instance)
                 printerName += QLatin1String("/") + QString::fromLocal8Bit(cupsPrinters[i].instance);
+                printerName += QLatin1Char('/') + QString::fromLocal8Bit(cupsPrinters[i].instance);
             widget.printers->addItem(printerName);
 …
     QFileSystemModel *fsm = new QFileSystemModel(widget.filename);
     fsm->setRootPath(QDir::homePath());
 #if !defined(QT_NO_COMPLETER) && !defined(QT_NO_FILEDIALOG)
     widget.filename->setCompleter(new QFSCompletor(fsm, widget.filename));
+#if !defined(QT_NO_FSCOMPLETER) && !defined(QT_NO_FILEDIALOG)
+    widget.filename->setCompleter(new QFSCompleter(fsm, widget.filename));
 #endif
 #endif
 …
         filePrintersAdded = false;
+    }
+    if (printer && filePrintersAdded && printer->printerName().isEmpty()) {
+    if (printer && filePrintersAdded && (printer->outputFormat() != QPrinter::NativeFormat
+                                         || printer->printerName().isEmpty()))
+    {
         if (printer->outputFormat() == QPrinter::PdfFormat)
             widget.printers->setCurrentIndex(widget.printers->count() - 2);
 …
 #endif
         if (lprPrinters.count() > 0) {
             QString type = lprPrinters.at(index).name + QLatin1String("@") + lprPrinters.at(index).host;
+            QString type = lprPrinters.at(index).name + QLatin1Char('@') + lprPrinters.at(index).host;
             if (!lprPrinters.at(index).comment.isEmpty())
             type += QLatin1String(", ") + lprPrinters.at(index).comment;
 …
 void QUnixPrintWidgetPrivate::_q_btnBrowseClicked()
+{
-    const int prevPrinter = widget.printers->currentIndex();
-    widget.printers->setCurrentIndex(widget.printers->count() - 2); // the pdf one
     QString filename = widget.filename->text();
 #ifndef QT_NO_FILEDIALOG
 …
         if (filename.endsWith(QString::fromLatin1(".ps"), Qt::CaseInsensitive))
             widget.printers->setCurrentIndex(widget.printers->count() - 1); // the postscript one
+    }
+    else
+        widget.printers->setCurrentIndex(prevPrinter);
+        else if (filename.endsWith(QString::fromLatin1(".pdf"), Qt::CaseInsensitive))
+            widget.printers->setCurrentIndex(widget.printers->count() - 2); // the pdf one
+        else if (widget.printers->currentIndex() != widget.printers->count() - 1) // if ps is not selected, pdf is default
+            widget.printers->setCurrentIndex(widget.printers->count() - 2); // the pdf one
+    }
+}
 …
     switch(section){
         case 0:
             return QVariant(QApplication::translate("QPPDOptionsModel","Name"));
+            return QVariant(QApplication::translate("QPPDOptionsModel", "Name"));
         case 1:
             return QVariant(QApplication::translate("QPPDOptionsModel","Value"));
+            return QVariant(QApplication::translate("QPPDOptionsModel", "Value"));
         default:
             return QVariant();

trunk/src/gui/dialogs/qprintdialog_win.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <private/qprintengine_win_p.h>
 #include <private/qprinter_p.h>
+#if defined(Q_CC_MINGW) && !defined(PD_NOCURRENTPAGE)
+#define PD_NOCURRENTPAGE    0x00800000
+#define PD_RESULT_PRINT 1
+#define PD_RESULT_APPLY 2
+#define START_PAGE_GENERAL  0XFFFFFFFF
+#endif
 QT_BEGIN_NAMESPACE
 …
 };
+#ifndef Q_OS_WINCE
+// If you change this function, make sure you also change the unicode equivalent
+template <class PrintDialog, class DeviceMode>
+static PrintDialog *qt_win_make_PRINTDLG(QWidget *parent,
+                                         QPrintDialog *pdlg,
+                                         QPrintDialogPrivate *d, HGLOBAL *tempDevNames)
+{
+    PrintDialog *pd = new PrintDialog;
+    memset(pd, 0, sizeof(PrintDialog));
+    pd->lStructSize = sizeof(PrintDialog);
+    void *devMode = sizeof(DeviceMode) == sizeof(DEVMODEA)
+                    ? (void *) d->ep->devModeA()
+                    : (void *) d->ep->devModeW();
+static void qt_win_setup_PRINTDLGEX(PRINTDLGEX *pd, QWidget *parent,
+                                    QPrintDialog *pdlg,
+                                    QPrintDialogPrivate *d, HGLOBAL *tempDevNames)
+{
+    DEVMODE *devMode = d->ep->devMode;
     if (devMode) {
         int size = sizeof(DeviceMode) + ((DeviceMode *) devMode)->dmDriverExtra;
+        int size = sizeof(DEVMODE) + devMode->dmDriverExtra;
         pd->hDevMode = GlobalAlloc(GHND, size);
+        {
             void *dest = GlobalLock(pd->hDevMode);
             memcpy(dest, d->ep->devMode, size);
+            memcpy(dest, devMode, size);
             GlobalUnlock(pd->hDevMode);
+        }
 …
         pd->Flags |= PD_NOPAGENUMS;
+    // we don't have a 'current page' notion in the QPrinter API yet.
+    // Neither do we support more than one page range, so limit those
+    // options
+    pd->Flags |= PD_NOCURRENTPAGE;
+    pd->nStartPage = START_PAGE_GENERAL;
+    pd->nPageRanges = 1;
+    pd->nMaxPageRanges = 1;
     if (d->ep->printToFile)
         pd->Flags |= PD_PRINTTOFILE;
     Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created));
     pd->hwndOwner = parent ? parent->winId() : 0;
     pd->nFromPage = qMax(pdlg->fromPage(), pdlg->minPage());
     pd->nToPage   = (pdlg->toPage() > 0) ? qMin(pdlg->toPage(), pdlg->maxPage()) : 1;
+    Q_ASSERT(parent != 0 && parent->testAttribute(Qt::WA_WState_Created));
+    pd->hwndOwner = parent->window()->winId();
+    pd->lpPageRanges[0].nFromPage = qMax(pdlg->fromPage(), pdlg->minPage());
+    pd->lpPageRanges[0].nToPage   = (pdlg->toPage() > 0) ? qMin(pdlg->toPage(), pdlg->maxPage()) : 1;
     pd->nCopies = d->ep->num_copies;
+    return pd;
+}
+#endif // Q_OS_WINCE
+// If you change this function, make sure you also change the ansi equivalent
+template <typename T>
+static void qt_win_clean_up_PRINTDLG(T **pd)
+{
+    delete *pd;
+    *pd = 0;
+}
+// If you change this function, make sure you also change the ansi equivalent
+template <typename T>
+static void qt_win_read_back_PRINTDLG(T *pd, QPrintDialog *pdlg, QPrintDialogPrivate *d)
+}
+static void qt_win_read_back_PRINTDLGEX(PRINTDLGEX *pd, QPrintDialog *pdlg, QPrintDialogPrivate *d)
+{
     if (pd->Flags & PD_SELECTION) {
 …
     } else if (pd->Flags & PD_PAGENUMS) {
         pdlg->setPrintRange(QPrintDialog::PageRange);
         pdlg->setFromTo(pd->nFromPage, pd->nToPage);
+        pdlg->setFromTo(pd->lpPageRanges[0].nFromPage, pd->lpPageRanges[0].nToPage);
     } else {
         pdlg->setPrintRange(QPrintDialog::AllPages);
 …
         parent = parent->window();
     else
+        parent = qApp->activeWindow();
+        parent = QApplication::activeWindow();
+    // If there is no window, fall back to the print dialog itself
+    if (parent == 0)
+        parent = q;
     QWidget modal_widget;
 …
     HGLOBAL *tempDevNames = ep->createDevNames();
+    bool done;
     bool result;
+    bool done;
+    void *pd = QT_WA_INLINE(
+        (void*)(qt_win_make_PRINTDLG<PRINTDLGW, DEVMODEW>(parent, q, this, tempDevNames)),
+        (void*)(qt_win_make_PRINTDLG<PRINTDLGA, DEVMODEA>(parent, q, this, tempDevNames))
+        );
+    bool doPrinting;
+    PRINTPAGERANGE pageRange;
+    PRINTDLGEX pd;
+    memset(&pd, 0, sizeof(PRINTDLGEX));
+    pd.lStructSize = sizeof(PRINTDLGEX);
+    pd.lpPageRanges = &pageRange;
+    qt_win_setup_PRINTDLGEX(&pd, parent, q, this, tempDevNames);
     do {
         done = true;
+        QT_WA({
+            PRINTDLGW *pdw = reinterpret_cast<PRINTDLGW *>(pd);
+            result = PrintDlgW(pdw);
+            if ((pdw->Flags & PD_PAGENUMS) && (pdw->nFromPage > pdw->nToPage))
+        doPrinting = false;
+        result = (PrintDlgEx(&pd) == S_OK);
+        if (result && (pd.dwResultAction == PD_RESULT_PRINT
+                       || pd.dwResultAction == PD_RESULT_APPLY))
+        {
+            doPrinting = (pd.dwResultAction == PD_RESULT_PRINT);
+            if ((pd.Flags & PD_PAGENUMS)
+                && (pd.lpPageRanges[0].nFromPage > pd.lpPageRanges[0].nToPage))
+            {
+                pd.lpPageRanges[0].nFromPage = 1;
+                pd.lpPageRanges[0].nToPage = 1;
                 done = false;
+            if (result && pdw->hDC == 0)
+            }
+            if (pd.hDC == 0)
                 result = false;
+            else if (!result)
+                done = true;
+        }, {
+            PRINTDLGA *pda = reinterpret_cast<PRINTDLGA *>(pd);
+            result = PrintDlgA(pda);
+            if ((pda->Flags & PD_PAGENUMS) && (pda->nFromPage > pda->nToPage))
+                done = false;
+            if (result && pda->hDC == 0)
+                result = false;
+            else if (!result)
+                done = true;
+        });
+        }
         if (!done) {
             QMessageBox::warning(0, QPrintDialog::tr("Print"),
 …
     // write values back...
+    if (result) {
+        QT_WA({
+            PRINTDLGW *pdw = reinterpret_cast<PRINTDLGW *>(pd);
+            qt_win_read_back_PRINTDLG(pdw, q, this);
+            qt_win_clean_up_PRINTDLG(&pdw);
+        }, {
+            PRINTDLGA *pda = reinterpret_cast<PRINTDLGA *>(pd);
+            qt_win_read_back_PRINTDLG(pda, q, this);
+            qt_win_clean_up_PRINTDLG(&pda);
+        });
+    if (result && (pd.dwResultAction == PD_RESULT_PRINT
+                   || pd.dwResultAction == PD_RESULT_APPLY))
+    {
+        qt_win_read_back_PRINTDLGEX(&pd, q, this);
         // update printer validity
         printer->d_func()->validPrinter = !ep->name.isEmpty();
 …
     GlobalFree(tempDevNames);
     q->done(result);
     return result;
+    q->done(result && doPrinting);
+    return result && doPrinting;
+}

trunk/src/gui/dialogs/qprintpreviewdialog.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qprintpreviewwidget.h"
 #include <private/qprinter_p.h>
+#include "private/qdialog_p.h"
 #include <QtGui/qaction.h>
 …
 #include <QtGui/qvalidator.h>
 #include <QtGui/qfiledialog.h>
+#include <QtGui/qmainwindow.h>
+#include <QtGui/qtoolbar.h>
+#include <QtGui/qformlayout.h>
 #include <QtCore/QCoreApplication>
 …
 namespace {
+class QPrintPreviewMainWindow : public QMainWindow
+{
+public:
+    QPrintPreviewMainWindow(QWidget *parent) : QMainWindow(parent) {}
+    QMenu *createPopupMenu() { return 0; }
+};
 class ZoomFactorValidator : public QDoubleValidator
+{
 …
 } // anonymous namespace
 class QPrintPreviewDialogPrivate
+class QPrintPreviewDialogPrivate : public QDialogPrivate
+{
     Q_DECLARE_PUBLIC(QPrintPreviewDialog)
 public:
     QPrintPreviewDialogPrivate(QPrintPreviewDialog *q)
         : q_ptr(q), printDialog(0), ownPrinter(false),
+    QPrintPreviewDialogPrivate()
+        : printDialog(0), ownPrinter(false),
           initialized(false) {}
 …
     void updateZoomFactor();
-    QPrintPreviewDialog *q_ptr;
     QPrintDialog *printDialog;
     QPrintPreviewWidget *preview;
 …
     QAction *printAction;
     QAction *pageSetupAction;
-    QAction *closeAction;
     QPointer<QObject> receiverToDisconnectOnClose;
 …
         preview = new QPrintPreviewWidget(printer, q);
+    }
     QObject::connect(preview, SIGNAL(paintRequested(QPrinter *)), q, SIGNAL(paintRequested(QPrinter *)));
+    QObject::connect(preview, SIGNAL(paintRequested(QPrinter*)), q, SIGNAL(paintRequested(QPrinter*)));
     QObject::connect(preview, SIGNAL(previewChanged()), q, SLOT(_q_previewChanged()));
     setupActions();
-    // Navigation
-    QToolButton* nextPageButton = new QToolButton;
-    nextPageButton->setDefaultAction(nextPageAction);
-    QToolButton* prevPageButton = new QToolButton;
-    prevPageButton->setDefaultAction(prevPageAction);
-    QToolButton* firstPageButton = new QToolButton;
-    firstPageButton->setDefaultAction(firstPageAction);
-    QToolButton* lastPageButton = new QToolButton;
-    lastPageButton->setDefaultAction(lastPageAction);
     pageNumEdit = new LineEdit;
     pageNumEdit->setAlignment(Qt::AlignRight);
     pageNumEdit->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding));
+    pageNumEdit->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
     pageNumLabel = new QLabel;
     QObject::connect(pageNumEdit, SIGNAL(editingFinished()), q, SLOT(_q_pageNumEdited()));
-    QToolButton* fitWidthButton = new QToolButton;
-    fitWidthButton->setDefaultAction(fitWidthAction);
-    QToolButton* fitPageButton = new QToolButton;
-    fitPageButton->setDefaultAction(fitPageAction);
     zoomFactor = new QComboBox;
 …
                      q, SLOT(_q_zoomFactorChanged()));
+    QToolButton* zoomInButton = new QToolButton;
+    zoomInButton->setDefaultAction(zoomInAction);
+    QPrintPreviewMainWindow *mw = new QPrintPreviewMainWindow(q);
+    QToolBar *toolbar = new QToolBar(mw);
+    toolbar->addAction(fitWidthAction);
+    toolbar->addAction(fitPageAction);
+    toolbar->addSeparator();
+    toolbar->addWidget(zoomFactor);
+    toolbar->addAction(zoomOutAction);
+    toolbar->addAction(zoomInAction);
+    toolbar->addSeparator();
+    toolbar->addAction(portraitAction);
+    toolbar->addAction(landscapeAction);
+    toolbar->addSeparator();
+    toolbar->addAction(firstPageAction);
+    toolbar->addAction(prevPageAction);
+    // this is to ensure the label text and the editor text are
+    // aligned in all styles - the extra QVBoxLayout is a workaround
+    // for bug in QFormLayout
+    QWidget *pageEdit = new QWidget(toolbar);
+    QVBoxLayout *vboxLayout = new QVBoxLayout;
+    vboxLayout->setContentsMargins(0, 0, 0, 0);
+    QFormLayout *formLayout = new QFormLayout;
+    formLayout->setWidget(0, QFormLayout::LabelRole, pageNumEdit);
+    formLayout->setWidget(0, QFormLayout::FieldRole, pageNumLabel);
+    vboxLayout->addLayout(formLayout);
+    vboxLayout->setAlignment(Qt::AlignVCenter);
+    pageEdit->setLayout(vboxLayout);
+    toolbar->addWidget(pageEdit);
+    toolbar->addAction(nextPageAction);
+    toolbar->addAction(lastPageAction);
+    toolbar->addSeparator();
+    toolbar->addAction(singleModeAction);
+    toolbar->addAction(facingModeAction);
+    toolbar->addAction(overviewModeAction);
+    toolbar->addSeparator();
+    toolbar->addAction(pageSetupAction);
+    toolbar->addAction(printAction);
+    // Cannot use the actions' triggered signal here, since it doesn't autorepeat
+    QToolButton *zoomInButton = static_cast<QToolButton *>(toolbar->widgetForAction(zoomInAction));
+    QToolButton *zoomOutButton = static_cast<QToolButton *>(toolbar->widgetForAction(zoomOutAction));
     zoomInButton->setAutoRepeat(true);
     zoomInButton->setAutoRepeatInterval(200);
     zoomInButton->setAutoRepeatDelay(200);
-    QToolButton* zoomOutButton = new QToolButton;
-    zoomOutButton->setDefaultAction(zoomOutAction);
     zoomOutButton->setAutoRepeat(true);
     zoomOutButton->setAutoRepeatInterval(200);
     zoomOutButton->setAutoRepeatDelay(200);
-    //Cannot use the actions' triggered signal here, since it doesnt autorepeat
     QObject::connect(zoomInButton, SIGNAL(clicked()), q, SLOT(_q_zoomIn()));
     QObject::connect(zoomOutButton, SIGNAL(clicked()), q, SLOT(_q_zoomOut()));
+    QToolButton* portraitButton = new QToolButton;
+    portraitButton->setDefaultAction(portraitAction);
+    QToolButton* landscapeButton = new QToolButton;
+    landscapeButton->setDefaultAction(landscapeAction);
+    QToolButton* singleModeButton = new QToolButton;
+    singleModeButton->setDefaultAction(singleModeAction);
+    QToolButton* facingModeButton = new QToolButton;
+    facingModeButton->setDefaultAction(facingModeAction);
+    QToolButton* overviewModeButton = new QToolButton;
+    overviewModeButton->setDefaultAction(overviewModeAction);
+    QToolButton *printButton = new QToolButton;
+    printButton->setDefaultAction(printAction);
+    QToolButton *pageSetupButton = new QToolButton;
+    pageSetupButton->setDefaultAction(pageSetupAction);
+    QToolButton *closeButton = new QToolButton;
+    closeButton->setDefaultAction(closeAction);
+    QHBoxLayout* modeLayout = new QHBoxLayout;
+    modeLayout->setSpacing(0);
+    modeLayout->addWidget(singleModeButton);
+    modeLayout->addWidget(facingModeButton);
+    modeLayout->addWidget(overviewModeButton);
+    QHBoxLayout *barLayout = new QHBoxLayout;
+    barLayout->addWidget(fitWidthButton);
+    barLayout->addWidget(fitPageButton);
+    barLayout->addWidget(zoomFactor);
+    barLayout->addWidget(zoomOutButton);
+    barLayout->addWidget(zoomInButton);
+    barLayout->addWidget(portraitButton);
+    barLayout->addWidget(landscapeButton);
+    barLayout->addStretch();
+    barLayout->addWidget(firstPageButton);
+    barLayout->addWidget(prevPageButton);
+    barLayout->addWidget(pageNumEdit);
+    barLayout->addWidget(pageNumLabel);
+    barLayout->addWidget(nextPageButton);
+    barLayout->addWidget(lastPageButton);
+    barLayout->addStretch();
+    barLayout->addLayout(modeLayout);
+    barLayout->addStretch();
+    barLayout->addWidget(pageSetupButton);
+    barLayout->addWidget(printButton);
+    barLayout->addWidget(closeButton);
+    QWidget* buttonBar = new QWidget;
+    buttonBar->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum));
+    barLayout->setMargin(0);
+    buttonBar->setLayout(barLayout);
+    mw->addToolBar(toolbar);
+    mw->setCentralWidget(preview);
+    // QMainWindows are always created as top levels, force it to be a
+    // plain widget
+    mw->setParent(q, Qt::Widget);
     QVBoxLayout *topLayout = new QVBoxLayout;
     topLayout->addWidget(buttonBar);
     topLayout->addWidget(preview);
+    topLayout->addWidget(mw);
+    topLayout->setMargin(0);
     q->setLayout(topLayout);
 …
 #endif
+        )
+        pageSetupButton->setEnabled(false);
+        pageSetupAction->setEnabled(false);
+    preview->setFocus();
+}
 …
     printAction = printerGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Print"));
     pageSetupAction = printerGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Page setup"));
-    closeAction = printerGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Close"));
     qt_setupActionIcon(printAction, QLatin1String("print"));
     qt_setupActionIcon(pageSetupAction, QLatin1String("page-setup"));
     QObject::connect(printAction, SIGNAL(triggered(bool)), q, SLOT(_q_print()));
     QObject::connect(pageSetupAction, SIGNAL(triggered(bool)), q, SLOT(_q_pageSetup()));
-    QObject::connect(closeAction, SIGNAL(triggered(bool)), q, SLOT(reject()));
     // Initial state:
 …
+{
     int curPage = preview->currentPage();
     int numPages = preview->numPages();
+    int numPages = preview->pageCount();
     nextPageAction->setEnabled(curPage < numPages);
     prevPageAction->setEnabled(curPage > 1);
 …
     Q_Q(QPrintPreviewDialog);
     int numPages = preview->numPages();
+    int numPages = preview->pageCount();
     int maxChars = QString::number(numPages).length();
     pageNumLabel->setText(QString(QLatin1String("/ %1")).arg(numPages));
+    pageNumLabel->setText(QString::fromLatin1("/ %1").arg(numPages));
     int cyphersWidth = q->fontMetrics().width(QString().fill(QLatin1Char('8'), maxChars));
     int maxWidth = pageNumEdit->minimumSizeHint().width() + cyphersWidth;
 …
         preview->setCurrentPage(1);
     else if (action == lastPageAction)
         preview->setCurrentPage(preview->numPages());
+        preview->setCurrentPage(preview->pageCount());
     updateNavActions();
+}
 …
+        }
         QString fileName = QFileDialog::getSaveFileName(q, title, printer->outputFileName(),
                                                         QLatin1String("*") + suffix);
+                                                        QLatin1Char('*') + suffix);
         if (!fileName.isEmpty()) {
             if (QFileInfo(fileName).suffix().isEmpty())
 …
     if (ok) {
         preview->setZoomFactor(factor/100.0);
         zoomFactor->setEditText(QString(QLatin1String("%1%")).arg(factor));
+        zoomFactor->setEditText(QString::fromLatin1("%1%").arg(factor));
         setFitting(false);
+    }
 …
     \brief The QPrintPreviewDialog class provides a dialog for
     previewing and configuring page layouts for printer output.
+    \ingroup standard-dialogs
+    \ingroup printing
     Using QPrintPreviewDialog in your existing application is
 …
 */
 QPrintPreviewDialog::QPrintPreviewDialog(QPrinter* printer, QWidget *parent, Qt::WindowFlags flags)
     : QDialog(parent, flags), d_ptr(new QPrintPreviewDialogPrivate(this))
+    : QDialog(*new QPrintPreviewDialogPrivate, parent, flags)
+{
     Q_D(QPrintPreviewDialog);
 …
 */
 QPrintPreviewDialog::QPrintPreviewDialog(QWidget *parent, Qt::WindowFlags f)
     : QDialog(parent, f), d_ptr(new QPrintPreviewDialogPrivate(this))
+    : QDialog(*new QPrintPreviewDialogPrivate, parent, f)
+{
     Q_D(QPrintPreviewDialog);
 …
         delete d->printer;
     delete d->printDialog;
-    delete d_ptr;
+}

trunk/src/gui/dialogs/qprintpreviewdialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_PRIVATE_SLOT(d_func(), void _q_zoomFactorChanged())
     QPrintPreviewDialogPrivate *d_ptr;
+    void *dummy; // ### Qt 5 - remove me
 };

trunk/src/gui/dialogs/qprogressdialog.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <limits.h>
+#if defined(QT_SOFTKEYS_ENABLED)
+#include <qaction.h>
+#endif
+#ifdef Q_WS_S60
+#include <QtGui/qdesktopwidget.h>
+#endif
 QT_BEGIN_NAMESPACE
 …
 #ifndef QT_NO_SHORTCUT
         escapeShortcut(0),
+#endif
+#ifdef QT_SOFTKEYS_ENABLED
+        cancelAction(0),
 #endif
         useDefaultCancelText(false)
 …
 #ifndef QT_NO_SHORTCUT
     QShortcut *escapeShortcut;
+#endif
+#ifdef QT_SOFTKEYS_ENABLED
+    QAction *cancelAction;
 #endif
     bool useDefaultCancelText;
 …
   \class QProgressDialog
   \brief The QProgressDialog class provides feedback on the progress of a slow operation.
   \ingroup dialogs
+  \mainclass
+  \ingroup standard-dialogs
   A progress dialog is used to give the user an indication of how long
 …
     resize(w, h);
     if (cancelButton)
+#if !defined(QT_SOFTKEYS_ENABLED)
         cancelButton->show();
+#else
+    {
+        d->cancelAction = new QAction(cancelButton->text(), cancelButton);
+        d->cancelAction->setSoftKeyRole(QAction::NegativeSoftKey);
+        connect(d->cancelAction, SIGNAL(triggered()), this, SIGNAL(canceled()));
+        addAction(d->cancelAction);
+    }
+#endif
+}
 …
     if (!cancelButtonText.isNull()) {
         if (d->cancel)
+        if (d->cancel) {
             d->cancel->setText(cancelButtonText);
+        else
+#ifdef QT_SOFTKEYS_ENABLED
+            d->cancelAction->setText(cancelButtonText);
+#endif
+        } else {
             setCancelButton(new QPushButton(cancelButtonText, this));
+        }
     } else {
         setCancelButton(0);
 …
   \warning If the progress dialog is modal
     (see QProgressDialog::QProgressDialog()),
     this function calls QApplication::processEvents(), so take care that
+    setValue() calls QApplication::processEvents(), so take care that
     this does not cause undesirable re-entrancy in your code. For example,
     don't use a QProgressDialog inside a paintEvent()!
 …
     if (d->shown_once) {
         if (isModal())
             qApp->processEvents();
+            QApplication::processEvents();
     } else {
         if (progress == 0) {
 …
     if (d->cancel)
         h += d->cancel->sizeHint().height() + spacing;
+#ifdef Q_WS_S60
+    if (QApplication::desktop()->size().height() > QApplication::desktop()->size().width())
+        return QSize(qMax(QApplication::desktop()->size().width(), sh.width() + 2 * margin), h);
+    else
+        return QSize(qMax(QApplication::desktop()->size().height(), sh.width() + 2 * margin), h);
+#else
     return QSize(qMax(200, sh.width() + 2 * margin), h);
+#endif
+}
 …
+{
     Q_D(QProgressDialog);
     if (ev->type() == QEvent::StyleChange)
+    if (ev->type() == QEvent::StyleChange) {
         d->layout();
     else if (ev->type() == QEvent::LanguageChange)
+    } else if (ev->type() == QEvent::LanguageChange) {
         d->retranslateStrings();
+    }
     QDialog::changeEvent(ev);
+}

trunk/src/gui/dialogs/qprogressdialog.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/dialogs/qsidebar.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QT_BEGIN_NAMESPACE
+void QSideBarDelegate::initStyleOption(QStyleOptionViewItem *option,
+                                         const QModelIndex &index) const
+{
+    QStyledItemDelegate::initStyleOption(option,index);
+    QVariant value = index.data(QUrlModel::EnabledRole);
+    if (value.isValid()) {
+        //If the bookmark/entry is not enabled then we paint it in gray
+        if (!qvariant_cast<bool>(value))
+            option->state &= ~QStyle::State_Enabled;
+    }
+}
 /*!
     QUrlModel lets you have indexes from a QFileSystemModel to a list.  When QFileSystemModel
 …
     if (index.data(Qt::DecorationRole).isNull())
-        flags &= ~Qt::ItemIsEnabled;
-    if (invalidUrls.contains(index.data(UrlRole).toUrl()))
         flags &= ~Qt::ItemIsEnabled;
 …
             if (!invalidUrls.contains(url))
                 invalidUrls.append(url);
+            //The bookmark is invalid then we set to false the EnabledRole
+            setData(index, false, EnabledRole);
+        } else {
+            //The bookmark is valid then we set to true the EnabledRole
+            setData(index, true, EnabledRole);
+        }
 …
         if (!url.isValid() || url.scheme() != QLatin1String("file"))
             continue;
+        //this makes sure the url is clean
+        const QString cleanUrl = QDir::cleanPath(url.toLocalFile());
+        url = QUrl::fromLocalFile(cleanUrl);
         for (int j = 0; move && j < rowCount(); ++j) {
+            if (index(j, 0).data(UrlRole) == url) {
+            QString local = index(j, 0).data(UrlRole).toUrl().toLocalFile();
+#if defined(Q_OS_WIN)
+            if (index(j, 0).data(UrlRole).toUrl().toLocalFile().toLower() == cleanUrl.toLower()) {
+#else
+            if (index(j, 0).data(UrlRole).toUrl().toLocalFile() == cleanUrl) {
+#endif
                 removeRow(j);
                 if (j <= row)
 …
+        }
         row = qMax(row, 0);
         QModelIndex idx = fileSystemModel->index(url.toLocalFile());
+        QModelIndex idx = fileSystemModel->index(cleanUrl);
         if (!fileSystemModel->isDir(idx))
             continue;
         insertRows(row, 1);
         setUrl(index(row, 0), url, idx);
         watching.append(QPair<QModelIndex, QString>(idx, url.toLocalFile()));
+        watching.append(qMakePair(idx, cleanUrl));
+    }
+}
 …
         return;
     if (fileSystemModel != 0) {
         disconnect(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
             this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
+        disconnect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            this, SLOT(dataChanged(QModelIndex,QModelIndex)));
         disconnect(model, SIGNAL(layoutChanged()),
             this, SLOT(layoutChanged()));
         disconnect(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+        disconnect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
             this, SLOT(layoutChanged()));
+    }
     fileSystemModel = model;
     if (fileSystemModel != 0) {
         connect(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
             this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
+        connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            this, SLOT(dataChanged(QModelIndex,QModelIndex)));
         connect(model, SIGNAL(layoutChanged()),
             this, SLOT(layoutChanged()));
         connect(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+        connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
             this, SLOT(layoutChanged()));
+    }
 …
     urlModel->setFileSystemModel(model);
     setModel(urlModel);
+    connect(selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
+            this, SLOT(clicked(const QModelIndex &)));
+    setItemDelegate(new QSideBarDelegate(this));
+    connect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+            this, SLOT(clicked(QModelIndex)));
 #ifndef QT_NO_DRAGANDDROP
     setDragDropMode(QAbstractItemView::DragDrop);
 #endif
     setContextMenuPolicy(Qt::CustomContextMenu);
     connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
             this, SLOT(showContextMenu(const QPoint &)));
+    connect(this, SIGNAL(customContextMenuRequested(QPoint)),
+            this, SLOT(showContextMenu(QPoint)));
     urlModel->setUrls(newUrls);
     setCurrentIndex(this->model()->index(0,0));
 …
 void QSidebar::selectUrl(const QUrl &url)
+{
     disconnect(selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
                this, SLOT(clicked(const QModelIndex &)));
+    disconnect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+               this, SLOT(clicked(QModelIndex)));
     selectionModel()->clear();
 …
+    }
     connect(selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
             this, SLOT(clicked(const QModelIndex &)));
+    connect(selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
+            this, SLOT(clicked(QModelIndex)));
+}

trunk/src/gui/dialogs/qsidebar_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qlistwidget.h>
 #include <qstandarditemmodel.h>
+#include <qstyleditemdelegate.h>
 #include <qurl.h>
 …
 class QFileSystemModel;
+class QSideBarDelegate : public QStyledItemDelegate
+{
+ public:
+     QSideBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) {}
+     void initStyleOption(QStyleOptionViewItem *option,
+                          const QModelIndex &index) const;
+};
 class Q_AUTOTEST_EXPORT QUrlModel : public QStandardItemModel
+{
 …
 public:
     enum Roles {
+        UrlRole = Qt::UserRole + 1
+        UrlRole = Qt::UserRole + 1,
+        EnabledRole = Qt::UserRole + 2
     };

trunk/src/gui/dialogs/qwizard.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qdebug.h>
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 extern bool qt_wince_is_mobile();     //defined in qguifunctions_wce.cpp
 #endif
 #include <string.h>     // for memset()
+#ifdef QT_SOFTKEYS_ENABLED
+#include "qaction.h"
+#endif
 QT_BEGIN_NAMESPACE
 …
 const int MacButtonTopMargin = 13;
 const int MacLayoutLeftMargin = 20;
+const int MacLayoutTopMargin = 14;
+//const int MacLayoutTopMargin = 14; // Unused. Save some space and avoid warning.
 const int MacLayoutRightMargin = 20;
 const int MacLayoutBottomMargin = 17;
 …
            && topLevelMarginRight == other.topLevelMarginRight
            && topLevelMarginTop == other.topLevelMarginTop
            && topLevelMarginBottom == other.topLevelMarginBottom
+           && topLevelMarginBottom == other.topLevelMarginBottom
            && childMarginLeft == other.childMarginLeft
            && childMarginRight == other.childMarginRight
 …
     QWizard *wiz = parentWidget() ? qobject_cast <QWizard *>(parentWidget()->parentWidget()) : 0;
     if (wiz) {
         // Designer dosen't support the Vista style for Wizards. This property is used to turn
+        // Designer dosen't support the Vista style for Wizards. This property is used to turn
         // off the Vista style.
         const QVariant v = wiz->property("_q_wizard_vista_off");
 …
     bool modern = ((info.wizStyle == QWizard::ModernStyle)
 #if !defined(QT_NO_STYLE_WINDOWSVISTA)
         || ((info.wizStyle == QWizard::AeroStyle)
             && (QVistaHelper::vistaState() == QVistaHelper::Classic) || vistaDisabled())
+        || ((info.wizStyle == QWizard::AeroStyle
+            && QVistaHelper::vistaState() == QVistaHelper::Classic) || vistaDisabled())
 #endif
     );
 …
             There is no widthForHeight() function, so we simulate it with a loop.
         */
         int candidateSubTitleWidth = qMin(512, 2 * qApp->desktop()->width() / 3);
+        int candidateSubTitleWidth = qMin(512, 2 * QApplication::desktop()->width() / 3);
         int delta = candidateSubTitleWidth >> 1;
         while (delta > 0) {
 …
         , maximumHeight(QWIDGETSIZE_MAX)
+    {
         for (int i = 0; i < QWizard::NButtons; ++i)
+        for (int i = 0; i < QWizard::NButtons; ++i) {
             btns[i] = 0;
+#ifdef QT_SOFTKEYS_ENABLED
+            softKeys[i] = 0;
+#endif
+        }
 #if !defined(QT_NO_STYLE_WINDOWSVISTA)
         if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA
 …
     void _q_emitCustomButtonClicked();
     void _q_updateButtonStates();
+    void _q_handleFieldObjectDestroyed(QObject *);
     void setStyle(QStyle *style);
 #ifdef Q_WS_MAC
 …
     QLabel *subTitleLabel;
     QWizardRuler *bottomRuler;
+#ifdef QT_SOFTKEYS_ENABLED
+    mutable QAction *softKeys[QWizard::NButtons];
+#endif
     QVBoxLayout *pageVBoxLayout;
 …
     const bool macStyle = (wstyle == QWizard::MacStyle);
     switch (which) {
     case QWizard::BackButton:
+    case QWizard::BackButton:
         return macStyle ? QWizard::tr("Go Back") : QWizard::tr("< &Back");
     case QWizard::NextButton:
+    case QWizard::NextButton:
         if (macStyle)
             return QWizard::tr("Continue");
 …
 void QWizardPrivate::addField(const QWizardField &field)
+{
+    Q_Q(QWizard);
     QWizardField myField = field;
     myField.resolve(defaultPropertyTable);
 …
         QObject::connect(myField.object, myField.changedSignal,
                          myField.page, SLOT(_q_maybeEmitCompleteChanged()));
+    QObject::connect(
+        myField.object, SIGNAL(destroyed(QObject*)), q,
+        SLOT(_q_handleFieldObjectDestroyed(QObject*)));
+}
 void QWizardPrivate::removeFieldAt(int index)
+{
+    Q_Q(QWizard);
     const QWizardField &field = fields.at(index);
     fieldIndexMap.remove(field.name);
 …
         QObject::disconnect(field.object, field.changedSignal,
                             field.page, SLOT(_q_maybeEmitCompleteChanged()));
+    QObject::disconnect(
+        field.object, SIGNAL(destroyed(QObject*)), q,
+        SLOT(_q_handleFieldObjectDestroyed(QObject*)));
     fields.remove(index);
+}
 …
             mainLayout->setMargin(0);
             mainLayout->setSpacing(0);
             pageVBoxLayout->setContentsMargins(deltaMarginLeft, deltaMarginTop,
+            pageVBoxLayout->setContentsMargins(deltaMarginLeft, deltaMarginTop,
                                                deltaMarginRight, deltaMarginBottom);
             buttonLayout->setContentsMargins(info.topLevelMarginLeft, info.topLevelMarginTop,
+            buttonLayout->setContentsMargins(info.topLevelMarginLeft, info.topLevelMarginTop,
                                              info.topLevelMarginRight, info.topLevelMarginBottom);
         } else {
             mainLayout->setContentsMargins(info.topLevelMarginLeft, info.topLevelMarginTop,
+            mainLayout->setContentsMargins(info.topLevelMarginLeft, info.topLevelMarginTop,
                                            info.topLevelMarginRight, info.topLevelMarginBottom);
             mainLayout->setHorizontalSpacing(info.hspacing);
 …
         Q_ASSERT(bottomSpacer);
         bottomSpacer->changeSize(0, 0, QSizePolicy::Ignored, expandPage ? QSizePolicy::Ignored : QSizePolicy::MinimumExpanding);
         pageVBoxLayout->invalidate();
+        pageVBoxLayout->invalidate();
+    }
 …
 #endif
     QSize minimumSize = mainLayout->totalMinimumSize() + QSize(0, extraHeight);
+    QSize maximumSize;
+#if defined(Q_WS_WIN)
+    if (QSysInfo::WindowsVersion > QSysInfo::WV_Me) // ### See Tasks 164078 and 161660
+#endif
+    maximumSize = mainLayout->totalMaximumSize();
+    QSize maximumSize = mainLayout->totalMaximumSize();
     if (info.header && headerWidget->maximumWidth() != QWIDGETSIZE_MAX) {
         minimumSize.setWidth(headerWidget->maximumWidth());
 …
         if (which < QWizard::NStandardButtons)
             pushButton->setText(buttonDefaultText(wizStyle, which, this));
+#ifdef QT_SOFTKEYS_ENABLED
+        QAction *softKey = new QAction(pushButton->text(), pushButton);
+        QAction::SoftKeyRole softKeyRole;
+        switch(which) {
+        case QWizard::NextButton:
+        case QWizard::FinishButton:
+        case QWizard::CancelButton:
+            softKeyRole = QAction::NegativeSoftKey;
+            break;
+        case QWizard::BackButton:
+        case QWizard::CommitButton:
+        case QWizard::HelpButton:
+        case QWizard::CustomButton1:
+        case QWizard::CustomButton2:
+        case QWizard::CustomButton3:
+        default:
+            softKeyRole = QAction::PositiveSoftKey;
+            break;
+        }
+        softKey->setSoftKeyRole(softKeyRole);
+        softKeys[which] = softKey;
+#endif
         connectButton(which);
+    }
 …
         QObject::connect(btns[which], SIGNAL(clicked()), q, SLOT(_q_emitCustomButtonClicked()));
+    }
+#ifdef QT_SOFTKEYS_ENABLED
+    QObject::connect(softKeys[which], SIGNAL(triggered()), btns[which], SIGNAL(clicked()));
+#endif
+}
 …
             else if (i < QWizard::NStandardButtons)
                 btns[i]->setText(buttonDefaultText(wizStyle, i, this));
+#ifdef QT_SOFTKEYS_ENABLED
+            softKeys[i]->setText(btns[i]->text());
+#endif
+        }
+    }
 …
     inHandleAeroStyleChange = true;
     vistaHelper->backButton()->disconnect();
+    vistaHelper->disconnectBackButton();
     q->removeEventFilter(vistaHelper);
 …
     } else {
         q->setMouseTracking(true); // ### original value possibly different
+#ifndef QT_NO_CURSOR
         q->unsetCursor(); // ### ditto
+#endif
         antiFlickerWidget->move(0, 0);
         vistaHelper->backButton()->hide();
+        vistaHelper->hideBackButton();
         vistaHelper->setTitleBarIconAndCaptionVisible(true);
+    }
 …
 #endif
+#ifdef QT_SOFTKEYS_ENABLED
+    QAbstractButton *wizardButton;
+    for (int i = 0; i < QWizard::NButtons; ++i) {
+        wizardButton = btns[i];
+        if (wizardButton && !wizardButton->testAttribute(Qt::WA_WState_Hidden)) {
+            wizardButton->hide();
+            q->addAction(softKeys[i]);
+        } else {
+            q->removeAction(softKeys[i]);
+        }
+    }
+#endif
     enableUpdates();
+}
+void QWizardPrivate::_q_handleFieldObjectDestroyed(QObject *object)
+{
+    QVector<QWizardField>::iterator it = fields.begin();
+    while (it != fields.end()) {
+        const QWizardField &field = *it;
+        if (field.object == object) {
+            fieldIndexMap.remove(field.name);
+            it = fields.erase(it);
+        } else {
+            ++it;
+        }
+    }
+}
 …
 #ifdef Q_WS_MAC
-#ifdef Q_WS_MAC32
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <QuickTime/QuickTime.h>
-QT_END_INCLUDE_NAMESPACE
-typedef OSErr (*PtrQTNewDataReferenceFromCFURL)(CFURLRef, UInt32, Handle*, OSType*);
-typedef OSErr (*PtrGetGraphicsImporterForDataRefWithFlags)(Handle, OSType, ComponentInstance*, long);
-typedef ComponentResult (*PtrGraphicsImportSetFlags)(GraphicsImportComponent, long);
-typedef ComponentResult (*PtrGraphicsImportCreateCGImage)(GraphicsImportComponent, CGImageRef*, UInt32);
-static PtrQTNewDataReferenceFromCFURL ptrQTNewDataReferenceFromCFURL = 0;
-static PtrGetGraphicsImporterForDataRefWithFlags ptrGetGraphicsImporterForDataRefWithFlags = 0;
-static PtrGraphicsImportSetFlags ptrGraphicsImportSetFlags = 0;
-static PtrGraphicsImportCreateCGImage ptrGraphicsImportCreateCGImage = 0;
-static bool resolveQuickTimeSymbols()
+{
-    if (ptrQTNewDataReferenceFromCFURL == 0) {
-        QLibrary library(QLatin1String("/System/Library/Frameworks/QuickTime.framework/QuickTime"));
-        ptrQTNewDataReferenceFromCFURL = reinterpret_cast<PtrQTNewDataReferenceFromCFURL>(library.resolve("QTNewDataReferenceFromCFURL"));
-        ptrGetGraphicsImporterForDataRefWithFlags = reinterpret_cast<PtrGetGraphicsImporterForDataRefWithFlags>(library.resolve("GetGraphicsImporterForDataRefWithFlags"));
-        ptrGraphicsImportSetFlags = reinterpret_cast<PtrGraphicsImportSetFlags>(library.resolve("GraphicsImportSetFlags"));
-        ptrGraphicsImportCreateCGImage = reinterpret_cast<PtrGraphicsImportCreateCGImage>(library.resolve("GraphicsImportCreateCGImage"));
+    }
-    return ptrQTNewDataReferenceFromCFURL != 0 && ptrGetGraphicsImporterForDataRefWithFlags != 0
-           && ptrGraphicsImportSetFlags != 0 && ptrGraphicsImportCreateCGImage != 0;
+}
-static QPixmap quicktimeTiff(const CFURLRef url)
+{
-    if (!resolveQuickTimeSymbols())
-        return QPixmap();
-    QCFType <CGImageRef> imageRef = 0;
-    Handle dataRef;
-    OSType dataRefType;
-    GraphicsImportComponent gi;
-    ComponentResult result;
-    result = ptrQTNewDataReferenceFromCFURL(url, 0, &dataRef, &dataRefType);
-    if (dataRef != 0) {
-        OSStatus err = ptrGetGraphicsImporterForDataRefWithFlags(dataRef, dataRefType, &gi, 0);
-        if (err == noErr && gi) {
-            result = ptrGraphicsImportSetFlags(gi, (kGraphicsImporterDontDoGammaCorrection
-                                                    + kGraphicsImporterDontUseColorMatching));
-            if (!result)
-                result = ptrGraphicsImportCreateCGImage(gi, &imageRef, 0);
-            if (result)
-                qWarning("Qt: Problem reading TIFF image %ld(%s:%d)", result, __FILE__, __LINE__);
-            DisposeHandle(dataRef);
-            CloseComponent(gi);
+        }
+    }
-    if (imageRef)
-        return QPixmap::fromMacCGImageRef(imageRef);
-    return QPixmap();
+}
-#endif // Q_WS_MAC32
 QPixmap QWizardPrivate::findDefaultBackgroundPixmap()
 …
             url = CFBundleCopyResourceURL(bundle, CFSTR("Background"), CFSTR("tif"), 0);
             if (url) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+                if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4) {
+                    QCFType<CGImageSourceRef> imageSource = CGImageSourceCreateWithURL(url, 0);
+                    QCFType<CGImageRef> image = CGImageSourceCreateImageAtIndex(imageSource, 0, 0);
+                    if (image) {
+                        int width = CGImageGetWidth(image);
+                        int height = CGImageGetHeight(image);
+                        if (width == ExpectedImageWidth && height == ExpectedImageHeight)
+                            return QPixmap::fromMacCGImageRef(image);
+                    }
+                } else
+#endif
+                {
+#ifdef Q_WS_MAC32
+                    return quicktimeTiff(url);
+#endif
+                QCFType<CGImageSourceRef> imageSource = CGImageSourceCreateWithURL(url, 0);
+                QCFType<CGImageRef> image = CGImageSourceCreateImageAtIndex(imageSource, 0, 0);
+                if (image) {
+                    int width = CGImageGetWidth(image);
+                    int height = CGImageGetHeight(image);
+                    if (width == ExpectedImageWidth && height == ExpectedImageHeight)
+                        return QPixmap::fromMacCGImageRef(image);
+                }
+            }
 …
     Q_D(QWizard);
     d->init();
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (!qt_wince_is_mobile())
         setWindowFlags(windowFlags() & ~Qt::WindowOkButtonHint);
 …
     Q_D(const QWizard);
     QSize result = d->mainLayout->totalSizeHint();
+#ifdef Q_WS_S60
+    QSize extra(QApplication::desktop()->availableGeometry(QCursor::pos()).size());
+#else
     QSize extra(500, 360);
+#endif
     if (d->wizStyle == MacStyle && d->current != -1) {
         QSize pixmap(currentPage()->pixmap(BackgroundPixmap).size());
 …
     changes. This ensures that QWizard updates the enabled or disabled state of
     its buttons. An example of the reimplementation is
     available \l{http://doc.trolltech.com/qq/qq22-qwizard.html#validatebeforeitstoolate}
     {here}.
+    available \l{http://qt.nokia.com/doc/qq/qq22-qwizard.html#validatebeforeitstoolate}
+    {here}.
     \sa completeChanged(), isFinalPage()

trunk/src/gui/dialogs/qwizard.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_PRIVATE_SLOT(d_func(), void _q_emitCustomButtonClicked())
     Q_PRIVATE_SLOT(d_func(), void _q_updateButtonStates())
+    Q_PRIVATE_SLOT(d_func(), void _q_handleFieldObjectDestroyed(QObject *))
     friend class QWizardPage;

trunk/src/gui/dialogs/qwizard_win.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     : pressed(false)
     , wizard(wizard)
+    , backButton_(0)
+{
     is_vista = resolveSymbols();
+    backButton_ = new QVistaBackButton(wizard);
+    if (is_vista)
+        backButton_ = new QVistaBackButton(wizard);
+}
 …
+{
     DWORD rgb;
     HANDLE hTheme = pOpenThemeData(qApp->desktop()->winId(), L"WINDOW");
+    HANDLE hTheme = pOpenThemeData(QApplication::desktop()->winId(), L"WINDOW");
     pGetThemeColor(
         hTheme, WIZ_WP_CAPTION, WIZ_CS_ACTIVE,
 …
             painter->paintEngine()->getDC());
+    Q_ASSERT(backButton_);
     const int btnTop = backButton_->mapToParent(QPoint()).y();
     const int btnHeight = backButton_->size().height();
 …
 void QVistaHelper::setMouseCursor(QPoint pos)
+{
+#ifndef QT_NO_CURSOR
     if (rtTop.contains(pos))
         wizard->setCursor(Qt::SizeVerCursor);
     else
         wizard->setCursor(Qt::ArrowCursor);
+#endif
+}
 …
     bool value = false;
     if (vistaState() == VistaAero) {
         HANDLE hTheme = pOpenThemeData(qApp->desktop()->winId(), L"WINDOW");
+        HANDLE hTheme = pOpenThemeData(QApplication::desktop()->winId(), L"WINDOW");
         if (!hTheme) return false;
         // Set up a memory DC and bitmap that we'll draw into
         HDC dcMem;
         HBITMAP bmp;
         BITMAPINFO dib = {0};
+        BITMAPINFO dib = {{0}};
         dcMem = CreateCompatibleDC(hdc);
 …
         HDC dcMem;
         HBITMAP bmp;
         BITMAPINFO dib = {0};
+        BITMAPINFO dib = {{0}};
         dcMem = CreateCompatibleDC(hdc);

trunk/src/gui/dialogs/qwizard_win_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #ifndef QT_NO_STYLE_WINDOWSVISTA
 #include <windows.h>
+#include <qt_windows.h>
 #include <qobject.h>
 #include <qwidget.h>
 …
     void paintEvent(QPaintEvent *event);
     QVistaBackButton *backButton() const { return backButton_; }
+    void disconnectBackButton() { if (backButton_) backButton_->disconnect(); }
+    void hideBackButton() { if (backButton_) backButton_->hide(); }
     void setWindowPosHack();
     QColor basicWindowFrameColor();

/branches/vendor/nokia/qt/4.6.1	merged	eligible
/branches/vendor/nokia/qt/current	merged	eligible
/branches/vendor/trolltech/qt/current	3-149

Context Navigation

Legend:

Download in other formats: