diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-12 16:55:10 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-11-12 16:55:10 (GMT) |
| commit | 5c7388f16f50cc867180d19c44549a2da2760696 (patch) | |
| tree | 5a69b6211ea1f2bf3cbc1176fb37715a7e98cac6 /tests/auto | |
| parent | 3f867b487ac1642ce3ae442e2dbbbf56029290cd (diff) | |
| parent | f7ee0c9efcb6cb36a95f49bc998524e25480f8ba (diff) | |
| download | Qt-5c7388f16f50cc867180d19c44549a2da2760696.zip Qt-5c7388f16f50cc867180d19c44549a2da2760696.tar.gz Qt-5c7388f16f50cc867180d19c44549a2da2760696.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6-ce
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qscopedpointer/tst_qscopedpointer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp index ddd5579..b99760e 100644 --- a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp +++ b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp @@ -321,7 +321,7 @@ struct RefCounted instanceCount.ref(); } - RefCounted(RefCounted const &other) + RefCounted(RefCounted const &) : ref(0) { instanceCount.ref(); @@ -335,6 +335,7 @@ struct RefCounted RefCounted &operator=(RefCounted const &) { + return *this; } QAtomicInt ref; |