Commit 6195d6b7 authored by Albert Astals Cid's avatar Albert Astals Cid

Merge remote-tracking branch 'origin/Applications/15.08'

parents 8eb8cfcf 1da3c424
......@@ -3293,6 +3293,7 @@ bool Document::canRemovePageAnnotation( const Annotation * annotation ) const
case Annotation::AHighlight:
case Annotation::AStamp:
case Annotation::AInk:
case Annotation::ACaret:
return true;
return false;
......@@ -341,6 +341,7 @@ Okular::Annotation* createAnnotationFromPopplerAnnotation( Poppler::Annotation *
case Poppler::Annotation::AGeom:
case Poppler::Annotation::AHighlight:
case Poppler::Annotation::AInk:
case Poppler::Annotation::ACaret:
externallyDrawn = true;
/* fallback */
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