Merge pull request #1427 from simonsonc/qgscolorbutton-deprecated-api

Replace deprecated API
qgis · Jun 6, 2014 · 8c513f9 · 8c513f9
2 parents ade4c7b + 60dfc79
commit 8c513f9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
@@ -25,6 +25,7 @@
 #include <QMouseEvent>
 #include <QMenu>
 #include <QClipboard>
+#include <QDrag>
 
 /*!
   \class QgsColorButton
@@ -117,7 +118,7 @@ QMimeData * QgsColorButton::createColorMimeData() const
 bool QgsColorButton::colorFromMimeData( const QMimeData * mimeData, QColor& resultColor )
 {
   //attempt to read color data directly from mime
-  QColor mimeColor = qVariantValue<QColor>( mimeData->colorData() );
+  QColor mimeColor = mimeData->colorData().value<QColor>();
   if ( mimeColor.isValid() )
   {
     if ( !( mColorDialogOptions & QColorDialog::ShowAlphaChannel ) )