Changeset 561 for trunk/config.tests/mac

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• config.tests/mac/crc.test (modified) (1 diff)
• config.tests/mac/crc/main.cpp (modified) (3 diffs)
• config.tests/mac/defaultarch.test (modified) (2 diffs)
• config.tests/mac/xcodeversion.cpp (modified) (1 diff)

trunk/config.tests/mac/crc.test

@@ -53 +53 @@
 cd "$OUTDIR/$TEST"
 
-make distclean >/dev/null 2>&1
+$MAKE distclean >/dev/null 2>&1
 "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
 
 if [ "$VERBOSE" = "yes" ]; then
-    make
+    $MAKE
 else
-    make >/dev/null 2>&1
+    $MAKE >/dev/null 2>&1
 fi
 

trunk/config.tests/mac/crc/main.cpp

@@ +1 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include <iostream>
 #include <cstdlib>
@@ -31 +72 @@
             ulTable[iCodes] = Reflect(iCodes, 8) << 24;
             for(int iPos = 0; iPos < 8; iPos++) {
-                ulTable[iCodes] = (ulTable[iCodes] << 1)
+                ulTable[iCodes] = ((ulTable[iCodes] << 1) & 0xffffffff)
                     ^ ((ulTable[iCodes] & (1 << 31)) ? ulPolynomial : 0);
             }
@@ -44 +85 @@
         for(int iPos = 1; iPos < (cChar + 1); iPos++) {
             if(ulReflect & 1) {
-                ulValue |= (1 << (cChar - iPos));
+                ulValue |= (1ul << (cChar - iPos));
             }
             ulReflect >>= 1;

trunk/config.tests/mac/defaultarch.test

@@ -4 +4 @@
 VERBOSE=$2
 WORKDIR=$3
-QT_MAC_DEFUALT_ARCH=
+QT_MAC_DEFAULT_ARCH=
 
 touch defaultarch.c
@@ -18 +18 @@
 # detect our known archs.
 if echo "$FIlE_OUTPUT" | grep '\<i386\>' > /dev/null 2>&1; then
-    QT_MAC_DEFUALT_ARCH=x86 # configure knows it as "x86" not "i386"
+    QT_MAC_DEFAULT_ARCH=x86 # configure knows it as "x86" not "i386"
 fi
 if echo "$FIlE_OUTPUT" | grep '\<x86_64\>' > /dev/null 2>&1; then
-    QT_MAC_DEFUALT_ARCH=x86_64
+    QT_MAC_DEFAULT_ARCH=x86_64
 fi
 if echo "$FIlE_OUTPUT" | grep '\<ppc\>' > /dev/null 2>&1; then
-    QT_MAC_DEFUALT_ARCH=ppc
+    QT_MAC_DEFAULT_ARCH=ppc
 fi
 if echo "$FIlE_OUTPUT" | grep '\<ppc64\>' > /dev/null 2>&1; then
-    QT_MAC_DEFUALT_ARCH=ppc64
+    QT_MAC_DEFAULT_ARCH=ppc64
 fi
 
-[ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEFUALT_ARCH to \"$QT_MAC_DEFUALT_ARCH\""
-export QT_MAC_DEFUALT_ARCH
+[ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEFAULT_ARCH to \"$QT_MAC_DEFAULT_ARCH\""
+export QT_MAC_DEFAULT_ARCH

trunk/config.tests/mac/xcodeversion.cpp

@@ +1 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include <stdlib.h>
 #include <stdio.h>