diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-21 10:37:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-21 10:37:21 +0100 |
| commit | 8fd1330029eafc3f9496febd1ac2597e786ba324 (patch) | |
| tree | 00acd1c068972d2de0083933227fae77824f5447 /src/widgets/dialogs | |
| parent | f9fc180d505382e559ebca8a2e6dd09ea3ae52bc (diff) | |
| parent | dcb710dd87ab15c3af803133ff2449902dbec036 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/dialogs/qfontdialog.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 7ba8f60f71..c22258b3d2 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -1735,8 +1735,9 @@ QColor QColorDialog::selectedColor() const */ void QColorDialog::setOption(ColorDialogOption option, bool on) { - Q_D(QColorDialog); - d->options->setOption(static_cast<QColorDialogOptions::ColorDialogOption>(option), on); + const QColorDialog::ColorDialogOptions previousOptions = options(); + if (!(previousOptions & option) != !on) + setOptions(previousOptions ^ option); } /*! diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index 79aab3280f..4036dc80ab 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -853,8 +853,9 @@ QFont QFontDialog::selectedFont() const */ void QFontDialog::setOption(FontDialogOption option, bool on) { - Q_D(QFontDialog); - d->options->setOption(static_cast<QFontDialogOptions::FontDialogOption>(option), on); + const QFontDialog::FontDialogOptions previousOptions = options(); + if (!(previousOptions & option) != !on) + setOptions(previousOptions ^ option); } /*! |