diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 09:44:27 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 09:44:27 (GMT) |
| commit | edf7c7c045559b1d03f1d64d2334adac7da88527 (patch) | |
| tree | b17960099bed14a06d53510ac13de0e6255a3e14 /configure | |
| parent | 2795a73158280ddce4eec57c643d367bb402a03d (diff) | |
| parent | c8bf9bd17a4520eefe4306b7b1bb4f93fb296d80 (diff) | |
| download | Qt-edf7c7c045559b1d03f1d64d2334adac7da88527.zip Qt-edf7c7c045559b1d03f1d64d2334adac7da88527.tar.gz Qt-edf7c7c045559b1d03f1d64d2334adac7da88527.tar.bz2 | |
Merge commit 'qt-mainline/4.6' into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsscene.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -2,6 +2,7 @@ ############################################################################# ## ## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## All rights reserved. ## Contact: Nokia Corporation (qt-info@nokia.com) ## ## This file is the build configuration utility of the Qt Toolkit. @@ -21,10 +22,9 @@ ## 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. +## 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. @@ -3767,7 +3767,7 @@ Qt for Embedded Linux only: proper license for this switch to work. Example values for <arch>: arm mips x86 generic - -armfpa ............. Target platform is uses the ARM-FPA floating point format. + -armfpa ............. Target platform uses the ARM-FPA floating point format. -no-armfpa .......... Target platform does not use the ARM-FPA floating point format. The floating point format is usually autodetected by configure. Use this @@ -5874,7 +5874,6 @@ case "$PLATFORM,$CFG_MAC_COCOA" in macx*,yes) # Cocoa QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5 - CFG_QT3SUPPORT="no" ;; macx*,no) # gcc, Carbon |