Use QColor instead of Qt::GlobalColor in item data

The QVariant constructor that takes a Qt::GlobalColor is removed in Qt 5. It is actually a kind of special case in Qt 4 anyway. Fix the uses of this by constructing a QColor and using that instead.
qgis · Apr 2, 2014 · 6ebd9a8 · 6ebd9a8
1 parent d398560
commit 6ebd9a8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp
@@ -353,7 +353,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
       if ( i == myGrayBand )
       {
         mHistoColors << Qt::darkGray;
-        cboHistoBand->setItemData( i - 1, Qt::darkGray, Qt::ForegroundRole );
+        cboHistoBand->setItemData( i - 1, QColor( Qt::darkGray ), Qt::ForegroundRole );
       }
       else
       {
@@ -366,7 +366,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
         {
           mHistoColors << Qt::black;
         }
-        cboHistoBand->setItemData( i - 1, Qt::black, Qt::ForegroundRole );
+        cboHistoBand->setItemData( i - 1, QColor( Qt::black ), Qt::ForegroundRole );
       }
     }
   }
@@ -399,7 +399,7 @@ void QgsRasterHistogramWidget::refreshHistogram()
         {
           myColor = Qt::black;
         }
-        cboHistoBand->setItemData( i - 1, Qt::black, Qt::ForegroundRole );
+        cboHistoBand->setItemData( i - 1, QColor( Qt::black ), Qt::ForegroundRole );
       }
       if ( i == myRedBand ||  i == myGreenBand || i == myBlueBand )
       {