diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-16 13:38:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-21 13:21:21 (GMT) |
| commit | cb64ac587249f5dc6563a035e2ef5a3ad2bc5d13 (patch) | |
| tree | 20935d37d27f438890bceb296b2c937b09ed004c | |
| parent | 6c5cbdbee91ea200321480dcee243ae061a3a902 (diff) | |
| download | Qt-cb64ac587249f5dc6563a035e2ef5a3ad2bc5d13.zip Qt-cb64ac587249f5dc6563a035e2ef5a3ad2bc5d13.tar.gz Qt-cb64ac587249f5dc6563a035e2ef5a3ad2bc5d13.tar.bz2 | |
xlC 7 cannot compile QtConcurrent with these templates here
| -rw-r--r-- | src/corelib/concurrent/qfuture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/concurrent/qfuture.h b/src/corelib/concurrent/qfuture.h index 47015ee..f2db5ac 100644 --- a/src/corelib/concurrent/qfuture.h +++ b/src/corelib/concurrent/qfuture.h @@ -210,7 +210,7 @@ public: bool operator==(const QFuture &other) const { return (d == other.d); } bool operator!=(const QFuture &other) const { return (d != other.d); } -#ifndef QT_NO_MEMBER_TEMPLATES +#if !defined(QT_NO_MEMBER_TEMPLATES) && !defined(Q_CC_XLC) template <typename T> QFuture(const QFuture<T> &other) : d(other.d) |