~ubuntu-branches/ubuntu/wily/marble/wily-proposed

« back to all changes in this revision

Viewing changes to src/plugins/render/progress/ProgressFloatItem.cpp

  • Committer: Package Import Robot
  • Author(s): Scarlett Clark, Jonathan Riddell, Scarlett Clark
  • Date: 2014-07-24 23:38:32 UTC
  • mfrom: (1.5.2)
  • Revision ID: package-import@ubuntu.com-20140724233832-7v4421t4khrhw487
Tags: 4:4.13.90-0ubuntu1
[ Jonathan Riddell ]
* Switch to libmarblewidget19 for new soversion

[ Scarlett Clark ]
* New upstream beta release
* Update: do_not_install_private_headers. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
203
203
    painter->restore();
204
204
}
205
205
 
206
 
bool ProgressFloatItem::eventFilter(QObject *object, QEvent *e)
207
 
{
208
 
    if ( !enabled() || !visible() ) {
209
 
        return false;
210
 
    }
211
 
 
212
 
    return AbstractFloatItem::eventFilter( object, e );
213
 
}
214
 
 
215
206
void ProgressFloatItem::removeProgressItem()
216
207
{
217
208
    m_jobMutex.lock();