diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-09-04 13:12:40 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-09-04 13:12:40 (GMT) |
| commit | e15ab744f15127422ef62a0b70e6cf129f52f48f (patch) | |
| tree | 72352e1e297f0322610234c2eeb994820407616e /doc/src/snippets/code/doc_src_s60-introduction.qdoc | |
| parent | 04802c1fe74439111c7bbe92fcb777dcbd618500 (diff) | |
| parent | b3b9813f1083fc556aea1f952329551da97aee90 (diff) | |
| download | Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.zip Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.gz Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/snippets/code/doc_src_s60-introduction.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_s60-introduction.qdoc | 55 |
1 files changed, 48 insertions, 7 deletions
diff --git a/doc/src/snippets/code/doc_src_s60-introduction.qdoc b/doc/src/snippets/code/doc_src_s60-introduction.qdoc index fa9fd45..8702b78 100644 --- a/doc/src/snippets/code/doc_src_s60-introduction.qdoc +++ b/doc/src/snippets/code/doc_src_s60-introduction.qdoc @@ -1,3 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation 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$ +** +****************************************************************************/ + //! [0] qmake //! [0] @@ -10,19 +51,19 @@ //! [2] qmake make debug-winscw release-armv5 - make sisx + make sis //! [2] //! [3] - make sisx QT_SISX_TARGET=debug-armv5 + make sis QT_SIS_TARGET=debug-armv5 //! [3] //! [4] - set QT_SISX_TARGET=debug-armv5 - make sisx + set QT_SIS_TARGET=debug-armv5 + make sis //! [4] //! [5] - set QT_SISX_OPTIONS=-i - make sisx -//! [5]
\ No newline at end of file + set QT_SIS_OPTIONS=-i + make sis +//! [5] |