From b8d6eee151adc47e0211501d7b09b1193417e9a0 Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Tue, 17 Mar 2009 16:39:16 +1000 Subject: [PATCH 2/5] Fix open source license check. --- src/build/bin/configure | 6 +++++- src/qtopiadesktop/build/bin/configure | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/build/bin/configure b/src/build/bin/configure index 3c1392f..6b75f4c 100755 --- a/src/build/bin/configure +++ b/src/build/bin/configure @@ -4359,7 +4359,11 @@ sub checkLicenseKey if ( -f "$depotpath/LICENSE.GPL" && configopt("free") ) { $licenseInfo{Product} .= " Open Source"; $licenseInfo{LicenseFile} = "LICENSE.GPL"; - $licenseInfo{DestLicenseFile} = "LICENSE.GPL2"; + if ( $qtVersionStr[1] == 4 ) { + $licenseInfo{DestLicenseFile} = "LICENSE.GPL2"; + } else { + $licenseInfo{DestLicenseFile} = "LICENSE.QtopiaGPL"; + } } elsif ( -f "$depotpath/LICENSE.TROLL" && configopt("depot") ) { $licenseInfo{Product} .= " Qt Software Internal"; $licenseInfo{LicenseFile} = "LICENSE.TROLL"; diff --git a/src/qtopiadesktop/build/bin/configure b/src/qtopiadesktop/build/bin/configure index bfb43ed..7f2bdd2 100755 --- a/src/qtopiadesktop/build/bin/configure +++ b/src/qtopiadesktop/build/bin/configure @@ -1612,7 +1612,11 @@ sub checkLicenseKey if ( -f "$depotpath/LICENSE.GPL" && configopt("free") ) { $licenseInfo{Product} .= " Open Source"; $licenseInfo{LicenseFile} = "LICENSE.GPL"; - $licenseInfo{DestLicenseFile} = "LICENSE.GPL2"; + if ( $qtVersionStr[1] == 4 ) { + $licenseInfo{DestLicenseFile} = "LICENSE.GPL2"; + } else { + $licenseInfo{DestLicenseFile} = "LICENSE.QtopiaGPL"; + } } elsif ( -f "$depotpath/LICENSE.TROLL" && configopt("depot") ) { $licenseInfo{Product} .= " Qt Software Internal"; $licenseInfo{LicenseFile} = "LICENSE.TROLL"; -- 1.6.1