diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2012-02-08 13:05:43 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-23 15:49:06 (GMT) |
| commit | 1764405a490873f18de302e6816c672b88179baa (patch) | |
| tree | 67dc58659ebf9fbc3ccf6ca35fb96369d2ec3b30 /mkspecs/qws/integrity-x86-cx86 | |
| parent | 1d9c7af9fb8391babe6cab70692c43d8f123d047 (diff) | |
| download | Qt-1764405a490873f18de302e6816c672b88179baa.zip Qt-1764405a490873f18de302e6816c672b88179baa.tar.gz Qt-1764405a490873f18de302e6816c672b88179baa.tar.bz2 | |
INTEGRITY mkspecs update
Modifies existing structure of INTEGRITY mkspecs to be more clear and
adds a new mkspec for INTEGRITY x86 target. This also moves mkspecs
to supported folder as this is the case in 4.8.x.
Task-number: QTBUG-24153
Change-Id: Iae893c20f88050040f7686ab2ab272c1d1af22bb
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/qws/integrity-x86-cx86')
| -rw-r--r-- | mkspecs/qws/integrity-x86-cx86/qmake.conf | 12 | ||||
| -rw-r--r-- | mkspecs/qws/integrity-x86-cx86/qplatformdefs.h | 42 |
2 files changed, 54 insertions, 0 deletions
diff --git a/mkspecs/qws/integrity-x86-cx86/qmake.conf b/mkspecs/qws/integrity-x86-cx86/qmake.conf new file mode 100644 index 0000000..b7de73b --- /dev/null +++ b/mkspecs/qws/integrity-x86-cx86/qmake.conf @@ -0,0 +1,12 @@ +# +# qmake configuration for integrity-ghs +# + +INTEGRITY_DIR = /enter/your/path/to/INTEGRITY +INTEGRITY_BSP = enter_your_bsp_name_here +QMAKE_CC = ccint86 +QMAKE_CXX = cxint86 +QMAKE_LINK = cxint86 +QMAKE_LINK_SHLIB = cxint86 +include(../../common/ghs-base-integrity.conf) + diff --git a/mkspecs/qws/integrity-x86-cx86/qplatformdefs.h b/mkspecs/qws/integrity-x86-cx86/qplatformdefs.h new file mode 100644 index 0000000..4f24712 --- /dev/null +++ b/mkspecs/qws/integrity-x86-cx86/qplatformdefs.h @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2012 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$ +** GNU Lesser General Public License Usage +** 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. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "../../common/integrity/qplatformdefs.h" |