From e82240baa7dd6dd1c2067bc0c05f6820219a842e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 2 Oct 2010 23:09:49 +1000 Subject: bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version --- src/qt-2-macosx-gcc-arch.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/qt-2-macosx-gcc-arch.patch diff --git a/src/qt-2-macosx-gcc-arch.patch b/src/qt-2-macosx-gcc-arch.patch new file mode 100644 index 0000000..5f52916 --- /dev/null +++ b/src/qt-2-macosx-gcc-arch.patch @@ -0,0 +1,20 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +The native build complains about: + +"You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration." + +diff -ur a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf +--- a/mkspecs/macx-g++/qmake.conf 2010-09-26 23:32:05.000000000 +1000 ++++ b/mkspecs/macx-g++/qmake.conf 2010-09-26 23:31:29.000000000 +1000 +@@ -13,8 +13,8 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc +-QMAKE_CXX = g++ ++QMAKE_CC = gcc -arch i386 ++QMAKE_CXX = g++ -arch i386 + + include(../common/mac-g++.conf) -- cgit v0.12