summaryrefslogtreecommitdiffstats
path: root/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
diff options
context:
space:
mode:
authorBłażej Szczygieł <spaz16@wp.pl>2017-01-11 21:45:27 +0100
committerBłażej Szczygieł <spaz16@wp.pl>2017-03-11 09:23:02 +0000
commit335dbece103e2cbf6c7cf819ab6672c2956b17b3 (patch)
treef6ecc6a247235c3dae0d607694356496dcf5d767 /src/plugins/styles/cleanlooks/qcleanlooksstyle.h
parent5ef7b26b9792b5aae4d289413a3a0691766b072e (diff)
Fix plastique, cleanlooks and motif animation timerHEADmaster
Move plastique and cleanlooks timer event to "event()" method, because "timerEvent()" doesn't work on class derivated from "QProxyStyle". Also unify plastique, cleanlooks and motif animation timer methods. This allows to kill timer for plastique and motif styles when it will be no longer necessary (as in cleanlooks style). Change-Id: I1365e57d56bf35bf07c3efc604482a5405608930 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/plugins/styles/cleanlooks/qcleanlooksstyle.h')
-rw-r--r--src/plugins/styles/cleanlooks/qcleanlooksstyle.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/styles/cleanlooks/qcleanlooksstyle.h b/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
index 76023bf..39720e1 100644
--- a/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
+++ b/src/plugins/styles/cleanlooks/qcleanlooksstyle.h
@@ -97,7 +97,7 @@ public:
protected:
- void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+ bool event(QEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
void startProgressAnimation(QObject *o, QProgressBar *bar);
void stopProgressAnimation(QObject *o, QProgressBar *bar);