diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-11-20 12:27:49 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-11-20 12:27:49 (GMT) |
| commit | bda75bfc7cf0137474005a0a733ff83e2aae16e9 (patch) | |
| tree | 13803dded750939f651951186c557cb051bd343f /configure | |
| parent | 8b45a7a160daa0d6b38ae1f6cbfd8162c580574b (diff) | |
| parent | a222302ca45e33306dacae0aa16a572c13abc483 (diff) | |
| download | Qt-bda75bfc7cf0137474005a0a733ff83e2aae16e9.zip Qt-bda75bfc7cf0137474005a0a733ff83e2aae16e9.tar.gz Qt-bda75bfc7cf0137474005a0a733ff83e2aae16e9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -460,11 +460,11 @@ elif [ $COMMERCIAL_USER = "yes" ]; then ;; esac case "$PlatformCode,$PLATFORM_MAC,$PLATFORM_QWS" in - X9,* | XC,* | XU,* | XW,*) + X9,* | XC,* | XU,* | XW,* | XM,*) # Qt All-OS LICENSE_EXTENSION="-ALLOS" ;; - 8M,* | S9,* | SC,* | SU,* | SW,* | X9,* | XC,* | XU,* | XW,*) + 8M,* | KM,* | S9,* | SC,* | SU,* | SW,* | X9,* | XC,* | XU,* | XW,*) # Qt for Embedded Linux LICENSE_EXTENSION="-EMBEDDED" ;; |