Mercurial > mxe-octave
changeset 1250:a817272c9934
bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Sat, 02 Oct 2010 23:09:49 +1000 |
| parents | df3c2fe12ee9 |
| children | de6579fc47b7 |
| files | src/qt-2-macosx-gcc-arch.patch |
| diffstat | 1 files changed, 20 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt-2-macosx-gcc-arch.patch Sat Oct 02 23:09:49 2010 +1000 @@ -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)