From ac43c3e1ad82dd0d389191ade3334f7c20fa4a3c Mon Sep 17 00:00:00 2001
From: Lincoln Ramsay <a1291762@gmail.com>
Date: Tue, 17 Mar 2009 16:39:02 +1000
Subject: [PATCH 1/5] Fix BETA/RC version detection.

---
 src/build/bin/configure               |    4 +++-
 src/qtopiadesktop/build/bin/configure |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/build/bin/configure b/src/build/bin/configure
index f1b0d80..3c1392f 100755
--- a/src/build/bin/configure
+++ b/src/build/bin/configure
@@ -4158,12 +4158,14 @@ sub getQtVersion
 
     if ( open(IN, "$qt_depot_path/src/corelib/global/qglobal.h" ) ) {
         while ( defined($_ = <IN>) ) {
-            if ( /QT_VERSION_STR\s+"(\d+\.\d+\.\d+)"/ ) {
+            if ( /QT_VERSION_STR\s+"(\d+\.\d+\.\d+)(.*)"/ ) {
                 $qtVersionStr = $1;
+                my $extra = $2;
                 ( $qtMajorVersion, $qtMinorVersion, $qtRevVersion ) = ( $qtVersionStr =~ /(\d+)\.(\d+)\.(\d+)/ );
                 $qtVersionStr[0] = $qtMajorVersion;
                 $qtVersionStr[1] = $qtMinorVersion;
                 $qtVersionStr[2] = $qtRevVersion;
+                $qtVersionStr[3] = $extra;
                 last;
             }
         }
diff --git a/src/qtopiadesktop/build/bin/configure b/src/qtopiadesktop/build/bin/configure
index f64d235..bfb43ed 100755
--- a/src/qtopiadesktop/build/bin/configure
+++ b/src/qtopiadesktop/build/bin/configure
@@ -1411,12 +1411,14 @@ sub getQtVersion
 
     if ( open(IN, "$qt_depot_path/src/corelib/global/qglobal.h" ) ) {
         while ( defined($_ = <IN>) ) {
-            if ( /QT_VERSION_STR\s+"(\d+\.\d+\.\d+)"/ ) {
+            if ( /QT_VERSION_STR\s+"(\d+\.\d+\.\d+)(.*)"/ ) {
                 $qtVersionStr = $1;
+                my $extra = $2;
                 ( $qtMajorVersion, $qtMinorVersion, $qtRevVersion ) = ( $qtVersionStr =~ /(\d+)\.(\d+)\.(\d+)/ );
                 $qtVersionStr[0] = $qtMajorVersion;
                 $qtVersionStr[1] = $qtMinorVersion;
                 $qtVersionStr[2] = $qtRevVersion;
+                $qtVersionStr[3] = $extra;
                 last;
             }
         }
-- 
1.6.1