summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2009-10-06 10:02:28 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-10-07 02:40:01 (GMT)
commitfff4fc598d506a213ff424874bb35dbc8bceb140 (patch)
tree7badfa327580be1e6b8309a9b81136d399f418a4
parent735111d3e3d61cd93e35aba668c84dc8f8d79180 (diff)
downloadQt-fff4fc598d506a213ff424874bb35dbc8bceb140.zip
Qt-fff4fc598d506a213ff424874bb35dbc8bceb140.tar.gz
Qt-fff4fc598d506a213ff424874bb35dbc8bceb140.tar.bz2
Build the demo-browser 32-bit on Mac since there's no 64-bit Flash
Reviewed-by: Simon Hausmann (cherry picked from commit 1f47353f90f6e1a3122eee14b9011bdeb7c7a93f)
-rw-r--r--demos/browser/browser.pro4
1 files changed, 4 insertions, 0 deletions
diff --git a/demos/browser/browser.pro b/demos/browser/browser.pro
index dab9387..f421c6a 100644
--- a/demos/browser/browser.pro
+++ b/demos/browser/browser.pro
@@ -80,6 +80,10 @@ mac {
ICON = browser.icns
QMAKE_INFO_PLIST = Info_mac.plist
TARGET = Browser
+
+ # No 64-bit Flash on Mac, so build the browser 32-bit
+ CONFIG -= x86_64
+ CONFIG += x86
}
wince*: {