Remove unused config.tests from config.tests/mac/*
The xarch.test and crc.test are not run by configure, so remove them along with the related CFG_MACH_XARCH and QT_NAMESPACE_MAC_CRC configure variables. The kEventClassQt variable in qt_mac_p.h is also unused now, so remove it as well. Change-Id: I596ab9b493ce3164b6a4d40e8942479efc91b60d Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Bradley T. Hughes
Qt by Nokia
parent
2c3b2b4703
commit
5efb3c2707
@ -1,71 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
SUCCESS=no
|
|
||||||
QMKSPEC=$1
|
|
||||||
XPLATFORM=`basename "$1"`
|
|
||||||
QMAKE_CONFIG=$2
|
|
||||||
VERBOSE=$3
|
|
||||||
SRCDIR=$4
|
|
||||||
OUTDIR=$5
|
|
||||||
TEST=$6
|
|
||||||
EXE=`basename "$6"`
|
|
||||||
ARG=$7
|
|
||||||
shift 7
|
|
||||||
LFLAGS=""
|
|
||||||
INCLUDEPATH=""
|
|
||||||
CXXFLAGS=""
|
|
||||||
while [ "$#" -gt 0 ]; do
|
|
||||||
PARAM=$1
|
|
||||||
case $PARAM in
|
|
||||||
-framework)
|
|
||||||
LFLAGS="$LFLAGS -framework \"$2\""
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-F*|-m*|-x*)
|
|
||||||
LFLAGS="$LFLAGS $PARAM"
|
|
||||||
CXXFLAGS="$CXXFLAGS $PARAM"
|
|
||||||
;;
|
|
||||||
-L*|-l*|-pthread)
|
|
||||||
LFLAGS="$LFLAGS $PARAM"
|
|
||||||
;;
|
|
||||||
-I*)
|
|
||||||
INC=`echo $PARAM | sed -e 's/^-I//'`
|
|
||||||
INCLUDEPATH="$INCLUDEPATH $INC"
|
|
||||||
;;
|
|
||||||
-f*|-D*)
|
|
||||||
CXXFLAGS="$CXXFLAGS $PARAM"
|
|
||||||
;;
|
|
||||||
-Qoption)
|
|
||||||
# Two-argument form for the Sun Compiler
|
|
||||||
CXXFLAGS="$CXXFLAGS $PARAM \"$2\""
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*) ;;
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
# debuggery
|
|
||||||
[ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION auto-detection... ($*)"
|
|
||||||
|
|
||||||
test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
|
|
||||||
|
|
||||||
cd "$OUTDIR/$TEST"
|
|
||||||
|
|
||||||
$MAKE distclean >/dev/null 2>&1
|
|
||||||
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
|
|
||||||
|
|
||||||
if [ "$VERBOSE" = "yes" ]; then
|
|
||||||
$MAKE
|
|
||||||
else
|
|
||||||
$MAKE >/dev/null 2>&1
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if [ -x "$EXE" ]; then
|
|
||||||
foo=`$OUTDIR/$TEST/$EXE $ARG`
|
|
||||||
echo "$foo"
|
|
||||||
else
|
|
||||||
echo "'CUTE'" #1129665605 # == 'CUTE'
|
|
||||||
fi
|
|
||||||
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
SOURCES = main.cpp
|
|
||||||
CONFIG -= app_bundle qt
|
|
||||||
@ -1,108 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
|
||||||
** Contact: http://www.qt-project.org/
|
|
||||||
**
|
|
||||||
** This file is part of the config.tests 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 <iostream>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <cstring>
|
|
||||||
|
|
||||||
|
|
||||||
class CCRC32
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
CCRC32() { initialize(); }
|
|
||||||
|
|
||||||
unsigned long FullCRC(const unsigned char *sData, unsigned long ulDataLength)
|
|
||||||
{
|
|
||||||
unsigned long ulCRC = 0xffffffff;
|
|
||||||
PartialCRC(&ulCRC, sData, ulDataLength);
|
|
||||||
return(ulCRC ^ 0xffffffff);
|
|
||||||
}
|
|
||||||
|
|
||||||
void PartialCRC(unsigned long *ulCRC, const unsigned char *sData, unsigned long ulDataLength)
|
|
||||||
{
|
|
||||||
while(ulDataLength--) {
|
|
||||||
*ulCRC = (*ulCRC >> 8) ^ ulTable[(*ulCRC & 0xFF) ^ *sData++];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
void initialize(void)
|
|
||||||
{
|
|
||||||
unsigned long ulPolynomial = 0x04C11DB7;
|
|
||||||
memset(&ulTable, 0, sizeof(ulTable));
|
|
||||||
for(int iCodes = 0; iCodes <= 0xFF; iCodes++) {
|
|
||||||
ulTable[iCodes] = Reflect(iCodes, 8) << 24;
|
|
||||||
for(int iPos = 0; iPos < 8; iPos++) {
|
|
||||||
ulTable[iCodes] = ((ulTable[iCodes] << 1) & 0xffffffff)
|
|
||||||
^ ((ulTable[iCodes] & (1 << 31)) ? ulPolynomial : 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
ulTable[iCodes] = Reflect(ulTable[iCodes], 32);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unsigned long Reflect(unsigned long ulReflect, const char cChar)
|
|
||||||
{
|
|
||||||
unsigned long ulValue = 0;
|
|
||||||
// Swap bit 0 for bit 7, bit 1 For bit 6, etc....
|
|
||||||
for(int iPos = 1; iPos < (cChar + 1); iPos++) {
|
|
||||||
if(ulReflect & 1) {
|
|
||||||
ulValue |= (1ul << (cChar - iPos));
|
|
||||||
}
|
|
||||||
ulReflect >>= 1;
|
|
||||||
}
|
|
||||||
return ulValue;
|
|
||||||
}
|
|
||||||
unsigned long ulTable[256]; // CRC lookup table array.
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
CCRC32 crc;
|
|
||||||
char *name;
|
|
||||||
if (argc < 2) {
|
|
||||||
std::cerr << "usage: crc <string>\n";
|
|
||||||
return 0;
|
|
||||||
} else {
|
|
||||||
name = argv[1];
|
|
||||||
}
|
|
||||||
std::cout << crc.FullCRC((unsigned char *)name, strlen(name)) << std::endl;
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
XARCH_SUPPORT=no
|
|
||||||
COMPILER=$1
|
|
||||||
VERBOSE=$2
|
|
||||||
WORKDIR=$3
|
|
||||||
|
|
||||||
touch xarch.c
|
|
||||||
|
|
||||||
if "$COMPILER" -c xarch.c -Xarch_i386 -mmmx 2>/dev/null 1>&2; then
|
|
||||||
if "$COMPILER" -c xarch.c -Xarch_i386 -mmmx 2>&1 | grep "unrecognized" >/dev/null ; then
|
|
||||||
true
|
|
||||||
else
|
|
||||||
XARCH_SUPPORT=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
rm -f xarch.c xarch.o
|
|
||||||
|
|
||||||
# done
|
|
||||||
if [ "$XARCH_SUPPORT" != "yes" ]; then
|
|
||||||
[ "$VERBOSE" = "yes" ] && echo "Xarch is not supported"
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
[ "$VERBOSE" = "yes" ] && echo "Xarch support detected"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
2
configure
vendored
2
configure
vendored
@ -774,7 +774,6 @@ CFG_FRAMEWORK=auto
|
|||||||
CFG_MAC_ARCHS=
|
CFG_MAC_ARCHS=
|
||||||
MAC_CONFIG_TEST_COMMANDLINE= # used to make the configure tests run with the correct arch's and SDK settings
|
MAC_CONFIG_TEST_COMMANDLINE= # used to make the configure tests run with the correct arch's and SDK settings
|
||||||
CFG_MAC_DWARF2=auto
|
CFG_MAC_DWARF2=auto
|
||||||
CFG_MAC_XARCH=auto
|
|
||||||
CFG_MAC_HARFBUZZ=no
|
CFG_MAC_HARFBUZZ=no
|
||||||
CFG_SXE=no
|
CFG_SXE=no
|
||||||
CFG_PREFIX_INSTALL=yes
|
CFG_PREFIX_INSTALL=yes
|
||||||
@ -7309,7 +7308,6 @@ QT_PATCH_VERSION = $QT_PATCH_VERSION
|
|||||||
#namespaces
|
#namespaces
|
||||||
QT_LIBINFIX = $QT_LIBINFIX
|
QT_LIBINFIX = $QT_LIBINFIX
|
||||||
QT_NAMESPACE = $QT_NAMESPACE
|
QT_NAMESPACE = $QT_NAMESPACE
|
||||||
QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC
|
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
if [ -n "$CFG_SYSROOT" ]; then
|
if [ -n "$CFG_SYSROOT" ]; then
|
||||||
|
|||||||
@ -80,16 +80,6 @@ class QDragMoveEvent;
|
|||||||
/* Event masks */
|
/* Event masks */
|
||||||
// internal Qt types
|
// internal Qt types
|
||||||
|
|
||||||
// Event class for our own Carbon events.
|
|
||||||
#if defined(QT_NAMESPACE) && defined(QT_NAMESPACE_MAC_CRC)
|
|
||||||
// Take the CRC we generated at configure time. This *may* result in a
|
|
||||||
// collision with another value If that is the case, please change the value
|
|
||||||
// here to something other than 'Cute'.
|
|
||||||
const UInt32 kEventClassQt = QT_NAMESPACE_MAC_CRC;
|
|
||||||
#else
|
|
||||||
const UInt32 kEventClassQt = 'Cute';
|
|
||||||
#endif
|
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
//AE types
|
//AE types
|
||||||
typeAEClipboardChanged = 1,
|
typeAEClipboardChanged = 1,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user