Commit 11633c69 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

smtkAssignColorsView: support Qt5

QVariant cannot be made from the `Qt::<color>` enumerations anymore.
See:

    https://doc.qt.io/qt-5/sourcebreaks.html#changes-to-qvariant
parent d824664c
......@@ -427,7 +427,7 @@ void smtkAssignColorsView::chooseDefaultColorAndApply()
pqSettings* settings = pqApplicationCore::instance()->settings();
QColor nextDefault =
QColorDialog::getColor(
settings->value("ModelBuilder/Operators/AssignColors/defaultColor", Qt::white).
settings->value("ModelBuilder/Operators/AssignColors/defaultColor", QColor(Qt::white)).
value<QColor>(),
nullptr, "Choose a default color for \"assign colors\"", QColorDialog::DontUseNativeDialog);
settings->setValue("ModelBuilder/Operators/AssignColors/defaultColor", nextDefault);
......@@ -450,7 +450,7 @@ void smtkAssignColorsView::applyDefaultColor()
pqSettings* settings = pqApplicationCore::instance()->settings();
QColor color = settings->value(
"ModelBuilder/Operators/AssignColors/defaultColor", Qt::white).value<QColor>();
"ModelBuilder/Operators/AssignColors/defaultColor", QColor(Qt::white)).value<QColor>();
//std::cout << "Apply default color\n";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment