diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-01-27 01:42:22 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-01-27 01:53:01 (GMT) |
| commit | 4c263772fa92cb270e32d5b1519b278f780f2635 (patch) | |
| tree | 6fce21967f33402b3c06d7e1b6b4a8368f955aab /configure | |
| parent | 4a0383f482d68d17ba1a9b63b7d81bf952849e3b (diff) | |
| download | Qt-4c263772fa92cb270e32d5b1519b278f780f2635.zip Qt-4c263772fa92cb270e32d5b1519b278f780f2635.tar.gz Qt-4c263772fa92cb270e32d5b1519b278f780f2635.tar.bz2 | |
configure: fixed configure on mac.
Broken due to conflict resolution in 5422e929cad04633a06c156cba96cfcd69262522
Since we now support compiling QPA (lighthouse) on Mac, the platform
logic in configure becomes a bit more complicated.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -187,9 +187,10 @@ fi PLATFORM_X11=no PLATFORM_QWS=maybe PLATFORM_QPA=maybe -BUILD_ON_MAC=no; +BUILD_ON_MAC=no if [ -d /System/Library/Frameworks/Carbon.framework ]; then PLATFORM_MAC=maybe + BUILD_ON_MAC=yes else PLATFORM_MAC=no fi |