From 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 Mon Sep 17 00:00:00 2001
From: Wolfgang Beck <wolfgang.beck@nokia.com>
Date: Tue, 16 Feb 2010 14:53:33 +1000
Subject: Mobility 404

---
 configure.exe                    | Bin 1180160 -> 1179136 bytes
 src/declarative/qml/qmlguard_p.h |   4 ++--
 tools/configure/configureapp.cpp |   4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.exe b/configure.exe
index 8913de1..980c190 100644
Binary files a/configure.exe and b/configure.exe differ
diff --git a/src/declarative/qml/qmlguard_p.h b/src/declarative/qml/qmlguard_p.h
index 1e55bcb..ad8dd84 100644
--- a/src/declarative/qml/qmlguard_p.h
+++ b/src/declarative/qml/qmlguard_p.h
@@ -94,10 +94,10 @@ private:
     inline void remGuard();
 };
 
-Q_DECLARE_METATYPE(QmlGuard<QObject>);
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QmlGuard<QObject>);
+
 #include "qmldeclarativedata_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 7154fd4..77b2f66 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -961,6 +961,7 @@ void Configure::parseCmdLine()
             if(i==argCount)
                 break;
             qmakeDefines += "QT_NAMESPACE="+configCmdLine.at(i);
+            dictionary[ "QT_NAMESPACE" ] = configCmdLine.at(i);
         } else if( configCmdLine.at(i) == "-qtlibinfix" ) {
             ++i;
             if(i==argCount)
@@ -2792,6 +2793,9 @@ void Configure::generateCachefile()
         if(!dictionary["ARM_FPU_TYPE"].isEmpty()) {
             configStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\"";
         }
+        if (!dictionary["QT_NAMESPACE"].isEmpty()) {
+            configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl;
+        }
 
         configStream.flush();
         configFile.close();
-- 
cgit v0.12