diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/concurrent/qfuturewatcher.h | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/concurrent/qfuturewatcher.h')
| -rw-r--r-- | src/concurrent/qfuturewatcher.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/concurrent/qfuturewatcher.h b/src/concurrent/qfuturewatcher.h index 11dab42174..439a25d844 100644 --- a/src/concurrent/qfuturewatcher.h +++ b/src/concurrent/qfuturewatcher.h @@ -63,7 +63,7 @@ class Q_CONCURRENT_EXPORT QFutureWatcherBase : public QObject Q_DECLARE_PRIVATE(QFutureWatcherBase) public: - QFutureWatcherBase(QObject *parent = 0); + explicit QFutureWatcherBase(QObject *parent = 0); int progressValue() const; int progressMinimum() const; @@ -119,7 +119,7 @@ template <typename T> class QFutureWatcher : public QFutureWatcherBase { public: - QFutureWatcher(QObject *_parent = 0) + explicit QFutureWatcher(QObject *_parent = 0) : QFutureWatcherBase(_parent) { } ~QFutureWatcher() @@ -189,7 +189,7 @@ template <> class QFutureWatcher<void> : public QFutureWatcherBase { public: - QFutureWatcher(QObject *_parent = 0) + explicit QFutureWatcher(QObject *_parent = 0) : QFutureWatcherBase(_parent) { } ~QFutureWatcher() |