diff options
author | Donald Carr <donald.carr@nokia.com> | 2012-02-23 21:07:42 +0000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-29 12:24:36 +0100 |
commit | 8dfc86e0d6391a9e923557732a3ddc6c37d98b89 (patch) | |
tree | bb4765c647de09ece421dd4dc018e2dc0d778bc2 | |
parent | 636e5c5d64479754b9d8d262bba64773e3b5cf93 (diff) |
Remove Mac/QPA collision breaking library linkage
Prior to this change, explicitly passing -qpa to configure breaks compilation on Mac. This is due to a false dichotomy between MAC/QPA
Change-Id: I52cacf96ae8d8d203787f9bbade417f2c55ab3f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
-rwxr-xr-x | configure | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -359,7 +359,6 @@ earlyArgParse() if [ "$PLATFORM_QPA" != "no" ]; then if [ "$PLATFORM_QPA" = "maybe" ]; then PLATFORM_X11=no - PLATFORM_MAC=no PLATFORM_QPA=yes fi else @@ -1222,7 +1221,6 @@ while [ "$#" -gt 0 ]; do ;; embedded-lite|qpa) PLATFORM_X11=no - PLATFORM_MAC=no PLATFORM_QPA=yes ;; sse) |