Skip to content
Permalink
Browse files
Merge pull request #1427 from simonsonc/qgscolorbutton-deprecated-api
Replace deprecated API
  • Loading branch information
wonder-sk committed Jun 6, 2014
2 parents ade4c7b + 60dfc79 commit 8c513f99de8247876d1d56b9bcbfc1b053d58c54
Showing with 2 additions and 1 deletion.
  1. +2 −1 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 ) )

0 comments on commit 8c513f9

Please sign in to comment.