diff options
author | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-06-30 18:09:21 +1000 |
---|---|---|
committer | Kevin Wu Won <kevin.wu-won@nokia.com> | 2010-06-30 18:09:21 +1000 |
commit | 2a920bf67c5ef573dc19ede75f71b06d6f60a86c (patch) | |
tree | b8b75bfa692cad9b4b726c225ff7646368cfb7a0 /configure | |
parent | e30484fdf114681bab1aef1f24a5d1e1a7ac25c9 (diff) |
Fix a bad merge
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -147,7 +147,7 @@ usage() echo " by double quotation. If a selected module depends on other modules" echo " those modules (and their dependencies) will automatically be enabled." echo "-maemo6 ........... Build Qt Mobility for Maemo6 (Harmattan)." - echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Freemantle)." + echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Fremantle)." echo "-sdk <sdk>......... Build using Apple provided SDK <path/to/sdk>." echo " example: -sdk /Developer/SDKs/MacOSX10.6.sdk" echo @@ -578,6 +578,7 @@ for module in $MOBILITY_MODULES; do ;; feedback) $relpath/bin/syncheaders $shadowpath/include/QtFeedback $relpath/src/feedback + ;; organizer) $relpath/bin/syncheaders $shadowpath/include/QtOrganizer $relpath/src/organizer ;; |