Showing with 3 additions and 342 deletions.

+0 −339 license.txt

+1 −1 src/app/qgsvectorlayerproperties.cpp

+2 −2 src/gui/qgshighlight.cpp
diff --git a/license.txt b/license.txt
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1025,7 +1025,7 @@ void QgsVectorLayerProperties::addJoinToTreeWidget( const QgsVectorJoinInfo& joi
     joinItem->setText( 2, join.targetFieldName );
 
   if ( join.memoryCache )
-    joinItem->setText( 3, QString::fromUtf8( "\u2714" ) );
+    joinItem->setText( 3, QChar( 0x2714 ) );
 
   mJoinTreeWidget->addTopLevelItem( joinItem );
   for ( int c = 0; c < 3; c++ )

diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp
@@ -380,7 +380,7 @@ void QgsHighlight::paint( QPainter* p )
       imagePainter->end();
 
       QColor color( mPen.color() );  // true output color
-      // coeficient to subtract alpha using green (temporary fill)
+      // coefficient to subtract alpha using green (temporary fill)
       double k = ( 255. - mBrush.color().alpha() ) / 255.;
       for ( int r = 0; r < image.height(); r++ )
       {
@@ -391,7 +391,7 @@ void QgsHighlight::paint( QPainter* p )
           if ( alpha > 0 )
           {
             int green = qGreen( rgba );
-            color.setAlpha( alpha - ( green * k ) );
+            color.setAlpha( qBound<int>( 0, alpha - ( green * k ), 255 ) );
 
             image.setPixel( c, r, color.rgba() );
           }