Changeset 846 for trunk/src/plugins/graphicssystems/trace

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)
• src/plugins/graphicssystems/trace/main.cpp (modified) (1 diff)
• src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp (modified) (2 diffs)
• src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h (modified) (1 diff)
• src/plugins/graphicssystems/trace/trace.pro (modified) (1 diff)

trunk/src/plugins/graphicssystems/trace/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -83 +83 @@
         if (outputFile.open(QIODevice::WriteOnly)) {
             QDataStream out(&outputFile);
-            out.writeBytes("qttrace", 7);
-            out << *buffer << updates;
+            out.setFloatingPointPrecision(QDataStream::SinglePrecision);
+
+            out.writeBytes("qttraceV2", 9);
+
+            uint version = 1;
+
+            out << version << *buffer << updates;
         }
         delete buffer;

trunk/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/graphicssystems/trace/trace.pro

@@ -6 +6 @@
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems
+symbian:TARGET.UID3 = 0x2002130E
 
 SOURCES = main.cpp qgraphicssystem_trace.cpp