diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-29 08:13:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-29 08:13:40 +0200 |
| commit | cc74452d6d259d36ac47c536f11a5efb269e8e44 (patch) | |
| tree | e43ac89e9edde354d12fbddffcbb6e40108cc643 /src/widgets/dialogs | |
| parent | 6cbd982836266a59e926d8f149ad0013bd8162a3 (diff) | |
| parent | e52fcb7dc78c83586c813f55f087a98bae4eaa0e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
configure
src/plugins/platforms/winrt/qwinrtclipboard.cpp
Change-Id: Ic6d58be3d1ed2bb507f2ba06c82361afd9f9ddb9
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 23436d1bf0..274785660b 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -2180,7 +2180,8 @@ QColor QColorDialog::getColor(const QColor &initial, QWidget *parent, const QStr QRgb QColorDialog::getRgba(QRgb initial, bool *ok, QWidget *parent) { - QColor color(getColor(QColor(initial), parent, QString(), ShowAlphaChannel)); + const QColor color = getColor(QColor::fromRgba(initial), parent, QString(), + ShowAlphaChannel); QRgb result = color.isValid() ? color.rgba() : initial; if (ok) *ok = color.isValid(); |