aboutsummaryrefslogtreecommitdiffstats
path: root/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp
diff options
context:
space:
mode:
authorMiodrag Milanovic <mmicko@gmail.com>2020-01-18 15:23:35 +0100
committerMiodrag Milanovic <mmicko@gmail.com>2020-01-18 15:23:35 +0100
commit38e3b6338c18e77cb14dae594befdbc4f4cdf8d0 (patch)
treeb372c3b6593e3eced7d3bc1b8f6c79ccb4e2749d /3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp
parentb67ba18590f4a4ec5bb3f1062a8b1495e88f14bb (diff)
downloadnextpnr-38e3b6338c18e77cb14dae594befdbc4f4cdf8d0.tar.gz
nextpnr-38e3b6338c18e77cb14dae594befdbc4f4cdf8d0.tar.bz2
nextpnr-38e3b6338c18e77cb14dae594befdbc4f4cdf8d0.zip
Various warning fixes
Diffstat (limited to '3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp')
-rw-r--r--3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp b/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp
index a2ef86c9..7cd130f3 100644
--- a/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp
+++ b/3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp
@@ -2207,9 +2207,9 @@ void QtColorEditWidget::buttonClicked()
{
bool ok = false;
QRgb oldRgba = m_color.rgba();
- QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, this);
- if (ok && newRgba != oldRgba) {
- setValue(QColor::fromRgba(newRgba));
+ QColor newRgba = QColorDialog::getColor(oldRgba, this).rgba();
+ if (newRgba.isValid() && newRgba.rgba() != oldRgba) {
+ setValue(newRgba);
emit valueChanged(m_color);
}
}