diff options
author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-01-13 07:33:11 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 03:48:14 +0100 |
commit | 79ebb1621e6cdb68a4ad107c8ac80eadb9c60366 (patch) | |
tree | d1c725a19ab9b57c263ef717cf9d0cb27403c3a4 /mkspecs/unsupported/nacl-g++ | |
parent | 4fa2d51cf1b11240e568d15da8530fdea5ac70cb (diff) | |
download | qtbase-79ebb1621e6cdb68a4ad107c8ac80eadb9c60366.tar.gz |
Add Native Client port mkspecs.
Support cross-compiling for x86 and x86_64 nacl.
Change-Id: I652702f9671b35963450c42dac5e27bedc698df0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs/unsupported/nacl-g++')
-rw-r--r-- | mkspecs/unsupported/nacl-g++/qmake.conf | 14 | ||||
-rw-r--r-- | mkspecs/unsupported/nacl-g++/qplatformdefs.h | 47 |
2 files changed, 61 insertions, 0 deletions
diff --git a/mkspecs/unsupported/nacl-g++/qmake.conf b/mkspecs/unsupported/nacl-g++/qmake.conf new file mode 100644 index 0000000000..f5dee80413 --- /dev/null +++ b/mkspecs/unsupported/nacl-g++/qmake.conf @@ -0,0 +1,14 @@ +# +# qmake configuration for building with nacl-g++ +# + +include(../../common/linux.conf) +include(../../common/qws.conf) +include(../../common/gcc-base-unix.conf) +include(../../common/g++-unix.conf) +include(../../common/nacl/nacl-base.conf) +include(../../common/nacl/g++-nacl32.conf) + +QT = core gui + +load(qt_config) diff --git a/mkspecs/unsupported/nacl-g++/qplatformdefs.h b/mkspecs/unsupported/nacl-g++/qplatformdefs.h new file mode 100644 index 0000000000..31f3a032b6 --- /dev/null +++ b/mkspecs/unsupported/nacl-g++/qplatformdefs.h @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ +#ifndef QPLATFORMDEFS_H +#define QPLATFORMDEFS_H + +#include "../../common/nacl/qplatformdefs.h" +#include "../../common/posix/qplatformdefs.h" + +#endif // QPLATFORMDEFS_H |