rpms/qt/devel qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch, 1.1, 1.2

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2220

Modified Files:
	qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch 
Log Message:
patch uic3 too


qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch:
 uic/uic.cpp    |    2 +-
 uic3/embed.cpp |    2 +-
 uic3/uic.cpp   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch	25 Jun 2010 19:05:01 -0000	1.1
+++ qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch	25 Jun 2010 19:08:41 -0000	1.2
@@ -1,6 +1,30 @@
+diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp
+--- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp.uic_multilib	2010-05-03 19:43:25.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/embed.cpp	2010-06-25 14:11:21.815474310 -0500
+@@ -152,7 +152,7 @@ void Ui3Reader::embed(const char *projec
+     for ( it = images.begin(); it != images.end(); ++it )
+         out << "**      " << *it << "\n";
+     out << "**\n";
+-    out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
++    out << "** Created: " << "\n";
+     out << "**      by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n";
+     out << "**\n";
+     out << "** WARNING! All changes made in this file will be lost!\n";
+diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp
+--- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp.uic_multilib	2010-05-03 19:43:25.000000000 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic3/uic.cpp	2010-06-25 14:11:32.910460623 -0500
+@@ -146,7 +146,7 @@ void Uic::writeCopyrightHeader(DomUI *ui
+         out << "/********************************************************************************\n";
+         out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
+         out << "**\n";
+-        out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
++        out << "** Created: " << "\n";
+         out << "**      " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
+         out << "**\n";
+         out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n";
 diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp
 --- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib	2010-05-03 19:43:25.000000000 -0500
-+++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp	2010-06-25 14:05:31.309711152 -0500
++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp	2010-06-25 14:10:45.360711498 -0500
 @@ -139,7 +139,7 @@ void Uic::writeCopyrightHeader(DomUI *ui
          out << "/********************************************************************************\n";
          out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";