Changeset 649 for branches/vendor/nokia/qt/current/tools/configure

Timestamp:

Mar 7, 2010, 11:52:24 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Merged in qt-everywhere-opensource-src-4.6.2 from Nokia.

Location:

branches/vendor/nokia/qt/current/tools/configure

Files:

• configure_pch.h (modified) (1 diff)
• configureapp.cpp (modified) (11 diffs)
• configureapp.h (modified) (1 diff)
• environment.cpp (modified) (1 diff)
• environment.h (modified) (1 diff)
• main.cpp (modified) (1 diff)
• tools.cpp (modified) (1 diff)
• tools.h (modified) (1 diff)

branches/vendor/nokia/qt/current/tools/configure/configure_pch.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/tools/configure/configureapp.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -318 +318 @@
     dictionary[ "DBUS" ]            = "auto";
     dictionary[ "S60" ]             = "yes";
+
 
     dictionary[ "STYLE_WINDOWS" ]   = "yes";
@@ -483 +484 @@
             dictionary[ "BUILDDEV" ] = "yes";
             dictionary["LICENSE_CONFIRMED"] = "yes";
+
+
+
         }
         else if( configCmdLine.at(i) == "-opensource" ) {
@@ -804 +808 @@
             dictionary[ "NATIVE_GESTURES" ] = "no";
 #if !defined(EVAL)
-        // Others ---------------------------------------------------
+        // -------------------------------------------
         else if (configCmdLine.at(i) == "-fpu" )
         {
@@ -813 +817 @@
         }
 
-        // S60 Support -------------------------------------------
         else if( configCmdLine.at(i) == "-s60" )
             dictionary[ "S60" ]    = "yes";
@@ -819 +822 @@
             dictionary[ "S60" ]    = "no";
 
+
+
+
+
+
+
         else if (configCmdLine.at(i) == "-fast" )
             dictionary[ "FAST" ] = "yes";
@@ -1823 +1832 @@
         desc(                      "-fpu <flags>",         "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2");
         desc("S60", "no",          "-no-s60",              "Do not compile in S60 support.");
-        desc("S60", "yes",         "-s60",                 "Compile with support for the S60 UI Framework\n");
+        desc("S60", "yes",         "-s60",                 "Compile with support for the S60 UI Framework");
+        desc("SYMBIAN_DEFFILES", "no",  "-no-usedeffiles",  "Disable the usage of DEF files.");
+        desc("SYMBIAN_DEFFILES", "yes", "-usedeffiles",     "Enable the usage of DEF files.\n");
         return true;
     }
@@ -2527 +2538 @@
     }
 
-    if (dictionary["MULTIMEDIA"] == "yes")
+    if (dictionary["MULTIMEDIA"] == "yes")
         qtConfig += "multimedia";
+
+
+
 
     if (dictionary["WEBKIT"] == "yes")
@@ -2745 +2759 @@
             configStream << " no_plugin_manifest";
 
+
+
+
+
+
+
+
         configStream << endl;
         configStream << "QT_ARCH = " << dictionary[ "ARCHITECTURE" ] << endl;
@@ -2771 +2792 @@
             configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl;
 
+
         if(!dictionary["ARM_FPU_TYPE"].isEmpty()) {
-            configStream<<"QMAKE_CXXFLAGS.ARMCC += --fpu "<< dictionary["ARM_FPU_TYPE"];
+            configStream<<";
         }
 
@@ -3268 +3290 @@
     }
 
+
+
+
+
+
+
+
+
     if(dictionary["ASSISTANT_WEBKIT"] == "yes")
         cout << "Using WebKit as html rendering engine in Qt Assistant." << endl;

branches/vendor/nokia/qt/current/tools/configure/configureapp.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/tools/configure/environment.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/tools/configure/environment.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/tools/configure/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/tools/configure/tools.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/tools/configure/tools.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])