AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dialogs: don't create platform helpers unconditionally

Browse Source 
No matter if Qt::AA_DontUseNativeDialogs was set, both QFileDialog and
QColorDialog were always unconditionally creating the platform helper
at construction time:

    QFooDialog()
    -> QFooDialogPrivate::init()
    -> QFooDialogPrivate::platformFooHelper()
    -> QDialogPrivate::platformHelper()

Only QFontDialog had the platformHelper() calls guarded with
canBeNativeDialog(). => Move the canBeNativeDialog() check inside
QDialogPrivate::platformHelper() where the platform helper
instance is created.

Task-number: QTBUG-55276
Change-Id: I84b595fbd009c70a3a1976ddbb32a835270c5203
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
J-P Nurmi 2016-08-15 10:52:10 +02:00
parent 31127d390e
commit 007f92c6ee
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qdialog.cpp
View File

@ -95,7 +95,7 @@ QPlatformDialogHelper *QDialogPrivate::platformHelper() const
{ {
// Delayed creation of the platform, ensuring that // Delayed creation of the platform, ensuring that
// that qobject_cast<> on the dialog works in the plugin. // that qobject_cast<> on the dialog works in the plugin.
if (!m_platformHelperCreated) { if (!m_platformHelperCreated && canBeNativeDialog()) {
m_platformHelperCreated = true; m_platformHelperCreated = true;
QDialogPrivate *ncThis = const_cast<QDialogPrivate *>(this); QDialogPrivate *ncThis = const_cast<QDialogPrivate *>(this);
QDialog *dialog = ncThis->q_func(); QDialog *dialog = ncThis->q_func();

2
src/widgets/dialogs/qfiledialog.cpp
View File

@ -2800,7 +2800,7 @@ void QFileDialogPrivate::init(const QUrl &directory, const QString &nameFilter,
} }
q->setAcceptMode(QFileDialog::AcceptOpen); q->setAcceptMode(QFileDialog::AcceptOpen);
nativeDialogInUse = (canBeNativeDialog() && platformFileDialogHelper() != 0); nativeDialogInUse = platformFileDialogHelper() != 0;
if (!nativeDialogInUse) if (!nativeDialogInUse)
createWidgets(); createWidgets();
q->setFileMode(QFileDialog::AnyFile); q->setFileMode(QFileDialog::AnyFile);

12
src/widgets/dialogs/qfontdialog.cpp
View File

@ -824,10 +824,8 @@ void QFontDialog::setCurrentFont(const QFont &font)
d->strikeout->setChecked(font.strikeOut()); d->strikeout->setChecked(font.strikeOut());
d->underline->setChecked(font.underline()); d->underline->setChecked(font.underline());
d->updateFamilies(); d->updateFamilies();
if (d->canBeNativeDialog()) { if (QPlatformFontDialogHelper *helper = d->platformFontDialogHelper())
if (QPlatformFontDialogHelper *helper = d->platformFontDialogHelper()) helper->setCurrentFont(font);
helper->setCurrentFont(font);
}
} }
/*! /*!
@ -840,10 +838,8 @@ void QFontDialog::setCurrentFont(const QFont &font)
QFont QFontDialog::currentFont() const QFont QFontDialog::currentFont() const
{ {
Q_D(const QFontDialog); Q_D(const QFontDialog);
if (d->canBeNativeDialog()) { if (const QPlatformFontDialogHelper *helper = d->platformFontDialogHelper())
if (const QPlatformFontDialogHelper *helper = d->platformFontDialogHelper()) return helper->currentFont();
return helper->currentFont();
}
return d->sampleEdit->font(); return d->sampleEdit->font();
} }