Mercurial > mxe-octave

annotate src/qt-2-macosx-gcc-arch.patch @ 1250:a817272c9934

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1250
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
1 This file is part of mingw-cross-env.
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
2 See doc/index.html for further information.
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
3
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
4 The native build complains about:
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
5
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
6 "You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration."
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
7
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
8 diff -ur a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
9 --- a/mkspecs/macx-g++/qmake.conf 2010-09-26 23:32:05.000000000 +1000
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
10 +++ b/mkspecs/macx-g++/qmake.conf 2010-09-26 23:31:29.000000000 +1000
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
11 @@ -13,8 +13,8 @@
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
12 QT += core gui
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
13 QMAKE_INCREMENTAL_STYLE = sublib
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
14
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
15 -QMAKE_CC = gcc
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
16 -QMAKE_CXX = g++
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
17 +QMAKE_CC = gcc -arch i386
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
18 +QMAKE_CXX = g++ -arch i386
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
19
a817272c9934 bugfix for qt on macx-g++: native build complains about 64-bit app with 32-bit version
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
20 include(../common/mac-g++.conf)