Changeset 651 for trunk/src/corelib/arch
- Timestamp:
- Mar 8, 2010, 12:52:58 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 42 edited
-
. (modified) (1 prop)
-
src/corelib/arch/alpha/qatomic_alpha.s (modified) (1 diff)
-
src/corelib/arch/arm/qatomic_arm.cpp (modified) (1 diff)
-
src/corelib/arch/armv6/qatomic_generic_armv6.cpp (modified) (1 diff)
-
src/corelib/arch/generic/qatomic_generic_unix.cpp (modified) (1 diff)
-
src/corelib/arch/generic/qatomic_generic_windows.cpp (modified) (1 diff)
-
src/corelib/arch/ia64/qatomic_ia64.s (modified) (1 diff)
-
src/corelib/arch/macosx/qatomic32_ppc.s (modified) (1 diff)
-
src/corelib/arch/mips/qatomic_mips32.s (modified) (1 diff)
-
src/corelib/arch/mips/qatomic_mips64.s (modified) (1 diff)
-
src/corelib/arch/parisc/q_ldcw.s (modified) (1 diff)
-
src/corelib/arch/parisc/qatomic_parisc.cpp (modified) (1 diff)
-
src/corelib/arch/powerpc/qatomic32.s (modified) (1 diff)
-
src/corelib/arch/powerpc/qatomic64.s (modified) (1 diff)
-
src/corelib/arch/qatomic_alpha.h (modified) (1 diff)
-
src/corelib/arch/qatomic_arch.h (modified) (1 diff)
-
src/corelib/arch/qatomic_arm.h (modified) (1 diff)
-
src/corelib/arch/qatomic_armv6.h (modified) (1 diff)
-
src/corelib/arch/qatomic_avr32.h (modified) (1 diff)
-
src/corelib/arch/qatomic_bfin.h (modified) (1 diff)
-
src/corelib/arch/qatomic_bootstrap.h (modified) (1 diff)
-
src/corelib/arch/qatomic_generic.h (modified) (1 diff)
-
src/corelib/arch/qatomic_i386.h (modified) (1 diff)
-
src/corelib/arch/qatomic_ia64.h (modified) (2 diffs)
-
src/corelib/arch/qatomic_macosx.h (modified) (1 diff)
-
src/corelib/arch/qatomic_mips.h (modified) (1 diff)
-
src/corelib/arch/qatomic_parisc.h (modified) (1 diff)
-
src/corelib/arch/qatomic_powerpc.h (modified) (1 diff)
-
src/corelib/arch/qatomic_s390.h (modified) (1 diff)
-
src/corelib/arch/qatomic_sh.h (modified) (1 diff)
-
src/corelib/arch/qatomic_sh4a.h (modified) (1 diff)
-
src/corelib/arch/qatomic_sparc.h (modified) (1 diff)
-
src/corelib/arch/qatomic_symbian.h (modified) (1 diff)
-
src/corelib/arch/qatomic_vxworks.h (modified) (1 diff)
-
src/corelib/arch/qatomic_windows.h (modified) (1 diff)
-
src/corelib/arch/qatomic_windowsce.h (modified) (1 diff)
-
src/corelib/arch/qatomic_x86_64.h (modified) (1 diff)
-
src/corelib/arch/sh/qatomic_sh.cpp (modified) (1 diff)
-
src/corelib/arch/sparc/qatomic32.s (modified) (1 diff)
-
src/corelib/arch/sparc/qatomic64.s (modified) (1 diff)
-
src/corelib/arch/sparc/qatomic_sparc.cpp (modified) (1 diff)
-
src/corelib/arch/symbian/qatomic_symbian.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.2 (added) merged: 650 /branches/vendor/nokia/qt/current merged: 649 /branches/vendor/nokia/qt/4.6.1 removed
- Property svn:mergeinfo changed
-
trunk/src/corelib/arch/alpha/qatomic_alpha.s
r561 r651 1 1 ;/**************************************************************************** 2 2 ;** 3 ;** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ;** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ;** All rights reserved. 5 5 ;** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/arm/qatomic_arm.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/armv6/qatomic_generic_armv6.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/generic/qatomic_generic_unix.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/generic/qatomic_generic_windows.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/ia64/qatomic_ia64.s
r561 r651 1 1 ;/**************************************************************************** 2 2 ;** 3 ;** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ;** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ;** All rights reserved. 5 5 ;** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/macosx/qatomic32_ppc.s
r561 r651 1 1 ;/**************************************************************************** 2 2 ;** 3 ;** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ;** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ;** All rights reserved. 5 5 ;** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/mips/qatomic_mips32.s
r561 r651 1 1 ;/**************************************************************************** 2 2 ;** 3 ;** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ;** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ;** All rights reserved. 5 5 ;** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/mips/qatomic_mips64.s
r561 r651 1 1 ;/**************************************************************************** 2 2 ;** 3 ;** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ;** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ;** All rights reserved. 5 5 ;** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/parisc/q_ldcw.s
r561 r651 1 1 ;/**************************************************************************** 2 2 ;** 3 ;** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ;** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ;** All rights reserved. 5 5 ;** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/parisc/qatomic_parisc.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/powerpc/qatomic32.s
r561 r651 1 1 ############################################################################ 2 2 ## 3 ## Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ## Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ## All rights reserved. 5 5 ## Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/powerpc/qatomic64.s
r561 r651 1 1 ############################################################################ 2 2 ## 3 ## Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ## Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ## All rights reserved. 5 5 ## Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_alpha.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_arch.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_arm.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_armv6.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_avr32.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_bfin.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_bootstrap.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_generic.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_i386.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_ia64.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) … … 206 206 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue) 207 207 { 208 return (T *)_InterlockedExchangePointer( &_q_value, newValue);208 return (T *)_InterlockedExchangePointer(, newValue); 209 209 } 210 210 -
trunk/src/corelib/arch/qatomic_macosx.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_mips.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_parisc.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_powerpc.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_s390.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_sh.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_sh4a.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_sparc.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_symbian.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_vxworks.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_windows.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_windowsce.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/qatomic_x86_64.h
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/sh/qatomic_sh.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/sparc/qatomic32.s
r561 r651 1 1 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 2 2 !! 3 !! Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 !! Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 !! All rights reserved. 5 5 !! Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/sparc/qatomic64.s
r561 r651 1 1 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 2 2 !! 3 !! Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 !! Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 !! All rights reserved. 5 5 !! Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/sparc/qatomic_sparc.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) -
trunk/src/corelib/arch/symbian/qatomic_symbian.cpp
r561 r651 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 20 09Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected])
Note:
See TracChangeset
for help on using the changeset viewer.
