Commit 0ea40098 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'qcolor-qvariant-qt5-fix'

11633c69

 smtkAssignColorsView: support Qt5
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !501
parents 32f8cbf4 11633c69
......@@ -412,7 +412,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);
......@@ -434,7 +434,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