rpms/qt/devel qt-x11-opensource-src-4.5.0-rc1-misc.patch, 1.1, 1.2 qt.spec, 1.230, 1.231

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22263

Modified Files:
	qt-x11-opensource-src-4.5.0-rc1-misc.patch qt.spec 
Log Message:
initialize callgrindChildExitCode


qt-x11-opensource-src-4.5.0-rc1-misc.patch:

Index: qt-x11-opensource-src-4.5.0-rc1-misc.patch
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt-x11-opensource-src-4.5.0-rc1-misc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-x11-opensource-src-4.5.0-rc1-misc.patch	14 Feb 2009 23:43:00 -0000	1.1
+++ qt-x11-opensource-src-4.5.0-rc1-misc.patch	16 Feb 2009 10:08:56 -0000	1.2
@@ -1,11 +1,21 @@
-diff -up qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp.orig qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp
---- qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp.orig	2009-02-11 13:14:12.000000000 +0100
-+++ qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp	2009-02-11 13:20:37.000000000 +0100
-@@ -1486,6 +1486,7 @@ int QTest::qExec(QObject *testObject, in
- #else
+diff -up qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp.misc qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp
+--- qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp.misc	2009-02-04 17:05:30.000000000 +0100
++++ qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp	2009-02-16 11:04:50.000000000 +0100
+@@ -1359,6 +1359,9 @@ int QTest::qExec(QObject *testObject, in
+     QBenchmarkGlobalData benchmarkData;
+     QBenchmarkGlobalData::current = &benchmarkData;
  
++#ifdef QTESTLIB_USE_VALGRIND
++      int callgrindChildExitCode = 0;
++#endif
+ 
+ #ifdef Q_WS_MAC
+      bool macNeedsActivate = qApp && qstrcmp(qApp->metaObject()->className(), "QApplicaion");
+@@ -1411,7 +1414,6 @@ int QTest::qExec(QObject *testObject, in
+     QTestResult::setCurrentTestObject(metaObject->className());
+     qParseArgs(argc, argv);
  #ifdef QTESTLIB_USE_VALGRIND
-+    int callgrindChildExitCode;
-     if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess)
-         return callgrindChildExitCode;
- #endif
+-    int callgrindChildExitCode;
+     if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) {
+         const QStringList origAppArgs(QCoreApplication::arguments());
+         if (!QBenchmarkValgrindUtils::rerunThroughCallgrind(origAppArgs, callgrindChildExitCode))


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- qt.spec	16 Feb 2009 00:00:22 -0000	1.230
+++ qt.spec	16 Feb 2009 10:08:57 -0000	1.231
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 0.2.rc1%{?dist}
+Release: 0.3.rc1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: LGPLv2 or GPLv3 with exceptions
@@ -737,6 +737,9 @@
 
 
 %changelog
+* Mon Feb 16 2009 Than Ngo <than at redhat.com> 4.5.0-0.3.rc1
+- fix callgrindChildExitCode is uninitialzed
+
 * Sun Feb 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-0.2.rc1
 - qt-copy-patches-20090215
 - License: +LGPLv2