diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 00:16:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 00:16:40 (GMT) |
| commit | 9dade8d2e57655019ed4dc2fcdc4e226401138a2 (patch) | |
| tree | 6aa3520f525b2ab923b4238079f1012756fa2488 /src/corelib/tools/qscopedpointer.cpp | |
| parent | e1dd37f6b54881aef3b9e1e686dc56bb96fc14ed (diff) | |
| parent | d23863952b0c13ccd8b2989d24153d94b3d3f83d (diff) | |
| download | Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.zip Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.tar.gz Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'src/corelib/tools/qscopedpointer.cpp')
| -rw-r--r-- | src/corelib/tools/qscopedpointer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index ef6cc39..5296bae 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -170,7 +170,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn bool QScopedPointer::operator==(const QScopedPointer<T> &other) const + \fn bool QScopedPointer::operator==(const QScopedPointer<T, Cleanup> &other) const Equality operator. Returns true if the scoped pointer \a other is pointing to the same object as this pointer, otherwise returns false. @@ -178,7 +178,7 @@ QT_BEGIN_NAMESPACE /*! - \fn bool QScopedPointer::operator!=(const QScopedPointer<T> &other) const + \fn bool QScopedPointer::operator!=(const QScopedPointer<T, Cleanup> &other) const Inequality operator. Returns true if the scoped pointer \a other is not pointing to the same object as this pointer, otherwise returns false. |