Changeset 846 for trunk/qmake/generators/xmloutput.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• qmake/generators/xmloutput.cpp (modified) (7 diffs)

trunk/qmake/generators/xmloutput.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -80 +80 @@
 {
     currentState = state;
+
+
+
+
+
 }
 
@@ -173 +178 @@
         newTagOpen(o.xo_text);
         break;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     case tCloseTag:
         if (o.xo_value.count())
@@ -183 +202 @@
     case tAttribute:
         addAttribute(o.xo_text, o.xo_value);
+
+
+
         break;
     case tData:
@@ -267 +289 @@
             break;
         case Attribute:
-            xmlFile << "/>";
+            xmlFile << "/>";
             tagStack.pop_back();
             currentState = Tag;
@@ -308 +330 @@
             return;
     }
-    QString outData = QString("<?xml version=\"%1\" encoding = \"%2\"?>")
+    QString outData = QString("<?xml version=\"%1\" encoding\"%2\"?>")
                               .arg(doConversion(version))
                               .arg(doConversion(encoding));
@@ -338 +360 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE