diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-11-16 23:57:12 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 17:55:55 (GMT) |
| commit | 798a479a956954794e7afff38822fd0205fec859 (patch) | |
| tree | 4ca413a67fb9997fabb7f4889b7f8ceee1eb6ed6 /mkspecs/unsupported | |
| parent | cd374b794eea65013b50cc60de3591f84be4f0d8 (diff) | |
| download | Qt-798a479a956954794e7afff38822fd0205fec859.zip Qt-798a479a956954794e7afff38822fd0205fec859.tar.gz Qt-798a479a956954794e7afff38822fd0205fec859.tar.bz2 | |
Windows: Add gcc 4.6 for cross building
Based on commit 1f2598b which did this for win32-g++-4.6
Change-Id: Icbeed880a6810f9e5a121d1b36ed194418b1633b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/unsupported')
| -rw-r--r-- | mkspecs/unsupported/win32-g++-4.6-cross/qmake.conf | 3 | ||||
| -rw-r--r-- | mkspecs/unsupported/win32-g++-4.6-cross/qplatformdefs.h | 42 |
2 files changed, 45 insertions, 0 deletions
diff --git a/mkspecs/unsupported/win32-g++-4.6-cross/qmake.conf b/mkspecs/unsupported/win32-g++-4.6-cross/qmake.conf new file mode 100644 index 0000000..b2a1bb7 --- /dev/null +++ b/mkspecs/unsupported/win32-g++-4.6-cross/qmake.conf @@ -0,0 +1,3 @@ +include(../win32-g++-cross/qmake.conf) +QMAKE_CFLAGS *= -fno-keep-inline-dllexport +QMAKE_CXXFLAGS *= -fno-keep-inline-dllexport diff --git a/mkspecs/unsupported/win32-g++-4.6-cross/qplatformdefs.h b/mkspecs/unsupported/win32-g++-4.6-cross/qplatformdefs.h new file mode 100644 index 0000000..837acbf --- /dev/null +++ b/mkspecs/unsupported/win32-g++-4.6-cross/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 "../../win32-g++-4.6/qplatformdefs.h" |