summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2010-04-14 06:48:40 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2010-04-14 10:35:40 (GMT)
commit4a32242e57ac689224340077656b30894171cb08 (patch)
tree00c5ff22390154ea88d199148a3e9dd518a54066 /tests
parentfb5ddafe2e9d5b982a43e1105b2d86a58ca312ca (diff)
downloadQt-4a32242e57ac689224340077656b30894171cb08.zip
Qt-4a32242e57ac689224340077656b30894171cb08.tar.gz
Qt-4a32242e57ac689224340077656b30894171cb08.tar.bz2
Force the bic test to compile in 32-bit mode on Mac
The stored data is 32-bit, gcc on 10.6 produces 64-bit objects by default.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/bic/tst_bic.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index 2349afa..28129c5 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -239,6 +239,9 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName)
QStringList args;
args << "-c"
<< "-I" + qtDir + "/include"
+#ifdef Q_OS_MAC
+ << "-arch" << "i386" // Always use 32-bit data on Mac.
+#endif
#ifndef Q_OS_WIN
<< "-I/usr/X11R6/include/"
#endif