diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-04-14 14:55:24 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-04-14 15:15:40 (GMT) |
| commit | 28d2b22a940174b4e64f6fa2f5548a7832fc07e8 (patch) | |
| tree | eba0f3e9b5e0026e39f99d03ed002fa7a0fe9d7a | |
| parent | 5dda84c32b38051ca64c3641ffaaa807e2406285 (diff) | |
| download | Qt-28d2b22a940174b4e64f6fa2f5548a7832fc07e8.zip Qt-28d2b22a940174b4e64f6fa2f5548a7832fc07e8.tar.gz Qt-28d2b22a940174b4e64f6fa2f5548a7832fc07e8.tar.bz2 | |
Fix logic for autodetecting the embedded-linux package
The previous version would get confused because the embedded package
also contains _x11 files.
Reviewed-by: Thiago
| -rwxr-xr-x | configure | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -119,7 +119,13 @@ elif [ -f "$relpath"/src/gui/kernel/qapplication_qws.cpp ]; then # ~ src/gui/base/qapplication_qws.cpp is present # ~ this is the free or commercial edition # ~ this is the internal edition and Qt Embedded is explicitly enabled - PLATFORM_QWS=maybe + if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ]; then + # This is a depot build, or an all-platforms package + PLATFORM_QWS=maybe + else + # This must be the embedded package, since the Qt/Mac source files are not present + PLATFORM_QWS=yes + fi fi #----------------------------------------------------------------------------- |