rpms/qt/devel qt-x11-free-3.3.8b-uic-multilib.patch, NONE, 1.1 qt.spec, 1.149, 1.150 qt-x11-free-3.3.8-uic-multilib.patch, 1.1, NONE

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14312

Modified Files:
	qt.spec 
Added Files:
	qt-x11-free-3.3.8b-uic-multilib.patch 
Removed Files:
	qt-x11-free-3.3.8-uic-multilib.patch 
Log Message:
update qt-x11-free-3.3.8b-uic-multilib.patch


qt-x11-free-3.3.8b-uic-multilib.patch:

--- NEW FILE qt-x11-free-3.3.8b-uic-multilib.patch ---
diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp
--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig	2008-01-24 13:25:29.000000000 +0100
+++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp	2008-01-24 13:28:17.000000000 +0100
@@ -320,7 +320,7 @@ int main( int argc, char * argv[] )
 	out << "/****************************************************************************" << endl;
 	out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl;
 	out << "**" << endl;
-	out << "** Created: " << QDateTime::currentDateTime().toString() << endl;
+	out << "** Created by User Interface Compiler" << endl;
 	out << "**" << endl;
 	out << "** WARNING! All changes made in this file will be lost!" << endl;
 	out << "****************************************************************************/" << endl << endl;
diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp
--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig	2008-01-24 13:28:30.000000000 +0100
+++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp	2008-01-24 13:29:10.000000000 +0100
@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const
     for ( it = images.begin(); it != images.end(); ++it )
 	out << "**      " << *it << "\n";
     out << "**\n";
-    out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
+    out << "** Created by The User Interface Compiler" << "\n";
     out << "**\n";
     out << "** WARNING! All changes made in this file will be lost!\n";
     out << "****************************************************************************/\n";


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- qt.spec	24 Jan 2008 11:28:44 -0000	1.149
+++ qt.spec	24 Jan 2008 12:34:05 -0000	1.150
@@ -28,7 +28,7 @@
 Patch19: qt-3.3.3-gtkstyle.patch 
 Patch20: qt-x11-free-3.3.5-gcc4-buildkey.patch
 Patch24: qt-x11-free-3.3.5-uic.patch
-Patch25: qt-x11-free-3.3.8-uic-multilib.patch
+Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
 Patch26: qt-3.3.6-fontrendering-punjabi-209970.patch
 Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
 Patch28: qt-3.3.6-fontrendering-or_IN-209098.patch


--- qt-x11-free-3.3.8-uic-multilib.patch DELETED ---