diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-13 08:29:20 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-13 08:29:20 (GMT) |
| commit | da0e9ac73411f9b6725680dd66059d5e6b23ac77 (patch) | |
| tree | 55aa8c4a1980440540543f48585fc7ddcbea9e9c /src | |
| parent | 13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (diff) | |
| parent | 34896621902f6d32058acf26c684e2f8fae65024 (diff) | |
| download | Qt-da0e9ac73411f9b6725680dd66059d5e6b23ac77.zip Qt-da0e9ac73411f9b6725680dd66059d5e6b23ac77.tar.gz Qt-da0e9ac73411f9b6725680dd66059d5e6b23ac77.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 6eb0109..e381433 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -418,7 +418,7 @@ public: // inline ~QSharedPointer() { } inline explicit QSharedPointer(T *ptr) : BaseClass(Qt::Uninitialized) - { internalConstruct(ptr); } + { BaseClass::internalConstruct(ptr); } template <typename Deleter> inline QSharedPointer(T *ptr, Deleter d) { BaseClass::internalConstruct(ptr, d); } @@ -448,7 +448,7 @@ public: template <class X> inline QSharedPointer<T> &operator=(const QWeakPointer<X> &other) - { internalSet(other.d, other.value); return *this; } + { BaseClass::internalSet(other.d, other.value); return *this; } template <class X> QSharedPointer<X> staticCast() const |