diff options
| author | Rafael Roquetto <rafael.roquetto@kdab.com> | 2012-03-07 07:53:14 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-07 23:40:13 (GMT) |
| commit | 1e0021d8d9e374ae3959fcd4eac5d9e7238cbc54 (patch) | |
| tree | 2cb0e30916bb9fe9503fbb304514251083a4ee3d /mkspecs/unsupported/qnx-g++ | |
| parent | 41ba5997bba81e225dbc449bb60ac86d88ed7fe3 (diff) | |
| download | Qt-4.8.1.zip Qt-4.8.1.tar.gz Qt-4.8.1.tar.bz2 | |
Renaming QNX mkspecsv4.8.1
Renamed from blackberry-* to qnx-* in order to match he <platform>-<compiler>
pattern.
cherry-picked from qt5/qtbase 6e58dd34ac96e2cf0807a227caaef74d15e272e7
Change-Id: I793af8d1a2053ccf37aaefd5849267797d0ee021
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/unsupported/qnx-g++')
| -rw-r--r-- | mkspecs/unsupported/qnx-g++/qmake.conf | 19 | ||||
| -rw-r--r-- | mkspecs/unsupported/qnx-g++/qplatformdefs.h | 42 |
2 files changed, 0 insertions, 61 deletions
diff --git a/mkspecs/unsupported/qnx-g++/qmake.conf b/mkspecs/unsupported/qnx-g++/qmake.conf deleted file mode 100644 index e354b2c..0000000 --- a/mkspecs/unsupported/qnx-g++/qmake.conf +++ /dev/null @@ -1,19 +0,0 @@ -# -# qmake configuration for qnx-g++ -# -# Written for QNX RTOS v6 with X11 -# - -include(../../common/qnx/qmake.conf) - -QMAKE_INCDIR_X11 = /opt/X11R6/include -QMAKE_LIBDIR_X11 = /opt/X11R6/lib -QMAKE_INCDIR_OPENGL = /opt/X11R6/include -QMAKE_LIBDIR_OPENGL = /opt/X11R6/lib - -QMAKE_LIBS_X11 = -lXext -lX11 -lm -lsocket -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_OPENGL = -lGL -QMAKE_LIBS_OPENGL_QT = -lGL - -load(qt_config) diff --git a/mkspecs/unsupported/qnx-g++/qplatformdefs.h b/mkspecs/unsupported/qnx-g++/qplatformdefs.h deleted file mode 100644 index e848982..0000000 --- a/mkspecs/unsupported/qnx-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** 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/qnx/qplatformdefs.h" |