diff options
| author | axis <qt-info@nokia.com> | 2010-02-18 14:31:01 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-18 14:31:01 (GMT) |
| commit | d24f440ed547f8e9a3737670e41bb645a9159501 (patch) | |
| tree | 14e9ac83c6d688e5480403a152e3ad2e60566ea8 /mkspecs/win32-msvc2002/qplatformdefs.h | |
| parent | b477d02479d9effbdb97e189a60dbf44dda5cbc9 (diff) | |
| parent | 505dc33a4060b6fb2a80f3a3ab2a6702ec0b5f3b (diff) | |
| download | Qt-d24f440ed547f8e9a3737670e41bb645a9159501.zip Qt-d24f440ed547f8e9a3737670e41bb645a9159501.tar.gz Qt-d24f440ed547f8e9a3737670e41bb645a9159501.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/Makefile.unix
qmake/generators/makefile.cpp
Diffstat (limited to 'mkspecs/win32-msvc2002/qplatformdefs.h')
| -rw-r--r-- | mkspecs/win32-msvc2002/qplatformdefs.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/mkspecs/win32-msvc2002/qplatformdefs.h b/mkspecs/win32-msvc2002/qplatformdefs.h deleted file mode 100644 index 6d71abf..0000000 --- a/mkspecs/win32-msvc2002/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec 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$ -** -****************************************************************************/ - -#include "../win32-msvc.net/qplatformdefs.h" |