diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-05 01:26:46 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-05 01:30:04 (GMT) |
| commit | b504a21a7d62b24ac5f16cb3f1a88479da1499d5 (patch) | |
| tree | 1b5236c294246874a2fde0157b06dfd23feb00e9 /src/corelib | |
| parent | a522568283195cd4b851b190d249d33e25489642 (diff) | |
| parent | d35fe5bb21008ab30c76ebd2fe688ea3e35c084e (diff) | |
| download | Qt-b504a21a7d62b24ac5f16cb3f1a88479da1499d5.zip Qt-b504a21a7d62b24ac5f16cb3f1a88479da1499d5.tar.gz Qt-b504a21a7d62b24ac5f16cb3f1a88479da1499d5.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/gui/itemviews/qlistview.cpp
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/x86_64/qatomic_sun.s | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/corelib/arch/x86_64/qatomic_sun.s b/src/corelib/arch/x86_64/qatomic_sun.s index 4517fe4..37969e6 100644 --- a/src/corelib/arch/x86_64/qatomic_sun.s +++ b/src/corelib/arch/x86_64/qatomic_sun.s @@ -1,43 +1,3 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! -!! Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -!! Contact: Nokia Corporation (qt-info@nokia.com) -!! -!! This file is part of the QtGui module of the Qt Toolkit. -!! -!! $QT_BEGIN_LICENSE:LGPL$ -!! No Commercial Usage -!! This file contains pre-release code and may not be distributed. -!! You may use this file in accordance with the terms and conditions -!! contained in the Technology Preview License Agreement accompanying -!! this package. -!! -!! GNU Lesser General Public License Usage -!! Alternatively, this file may be used under the terms of the GNU Lesser -!! General Public License version 2.1 as published by the Free Software -!! Foundation and appearing in the file LICENSE.LGPL included in the -!! packaging of this file. Please review the following information to -!! ensure the GNU Lesser General Public License version 2.1 requirements -!! will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -!! -!! In addition, as a special exception, Nokia gives you certain -!! additional rights. These rights are described in the Nokia Qt LGPL -!! Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this -!! package. -!! -!! If you have questions regarding the use of this file, please contact -!! Nokia at qt-info@nokia.com. -!! -!! -!! -!! -!! -!! -!! -!! -!! $QT_END_LICENSE$ -!! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .code64 .globl q_atomic_increment |