From 3bd25ae28da88adcbb05dcf63c2a1206fa5b8192 Mon Sep 17 00:00:00 2001
From: Lincoln Ramsay <a1291762@gmail.com>
Date: Tue, 17 Mar 2009 16:39:32 +1000
Subject: [PATCH 3/5] Use new switches required by Qt 4.5.0.

---
 src/build/bin/configure               |   18 ++++++++++++++++++
 src/qtopiadesktop/build/bin/configure |    9 +++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/src/build/bin/configure b/src/build/bin/configure
index 6b75f4c..0a9c8e4 100755
--- a/src/build/bin/configure
+++ b/src/build/bin/configure
@@ -3123,6 +3123,15 @@ if ( opt("qtopia_ui") && !opt("qte_config") ) {
                "-nomake examples -nomake demos -nomake docs ".
                "-DQT_QWS_DISABLE_FLUSHCLIPPING ".
                "-confirm-license";
+    if ( $qtVersionStr[1] >= 5 ) {
+        if ( $licenseInfo{DestLicenseFile} eq "LICENSE.TROLL" ) {
+            $args .= " -nokia-developer";
+        } elsif ( $licenseInfo{DestLicenseFile} eq "LICENSE.QtopiaGPL" ) {
+            $args .= " -opensource";
+        } else {
+            $args .= " -commercial";
+        }
+    }
     if ($qtVersionStr[1] >= 5) {
         $args .= " -no-scripttools";
     }
@@ -5264,6 +5273,15 @@ sub setup_dqt_config
     my $args = "-platform $qt_platform ".
                "-no-stl -no-exceptions -no-webkit -no-xmlpatterns -no-phonon -fast ".
                "-confirm-license";
+    if ( $qtVersionStr[1] >= 5 ) {
+        if ( $licenseInfo{DestLicenseFile} eq "LICENSE.TROLL" ) {
+            $args .= " -nokia-developer";
+        } elsif ( $licenseInfo{DestLicenseFile} eq "LICENSE.QtopiaGPL" ) {
+            $args .= " -opensource";
+        } else {
+            $args .= " -commercial";
+        }
+    }
     map { $args .= " -no-sql-".basename($_) if ( basename($_) ne "tmp" && -d $_ ); } glob("$qt_depot_path/src/plugins/sqldrivers/*");
     $args .= " -qt-sql-sqlite";
     $args .= " -no-dbus -no-openssl".
diff --git a/src/qtopiadesktop/build/bin/configure b/src/qtopiadesktop/build/bin/configure
index 7f2bdd2..4560b2a 100755
--- a/src/qtopiadesktop/build/bin/configure
+++ b/src/qtopiadesktop/build/bin/configure
@@ -1984,6 +1984,15 @@ sub setup_dqt_config
     my $args = "-platform $qt_platform ".
                "-no-stl -no-exceptions -no-webkit -no-xmlpatterns -no-phonon -no-qt3support -fast ".
                "-confirm-license";
+    if ( $qtVersionStr[1] >= 5 ) {
+        if ( $licenseInfo{DestLicenseFile} eq "LICENSE.TROLL" ) {
+            $args .= " -nokia-developer";
+        } elsif ( $licenseInfo{DestLicenseFile} eq "LICENSE.QtopiaGPL" ) {
+            $args .= " -opensource";
+        } else {
+            $args .= " -commercial";
+        }
+    }
     map { $args .= " -no-sql-".basename($_) if ( basename($_) ne "tmp" && -d $_ ); } glob("$qt_depot_path/src/plugins/sqldrivers/*");
     $args .= " -qt-sql-sqlite";
     if ( !$isWindows ) {
-- 
1.6.1