summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xqt3-tqt3/create_tqt3_from_qt33
-rw-r--r--qt3-tqt3/tqt3_fixups_batch3.diff12
2 files changed, 14 insertions, 1 deletions
diff --git a/qt3-tqt3/create_tqt3_from_qt3 b/qt3-tqt3/create_tqt3_from_qt3
index ae1b593..d1bf9a7 100755
--- a/qt3-tqt3/create_tqt3_from_qt3
+++ b/qt3-tqt3/create_tqt3_from_qt3
@@ -6,9 +6,10 @@ cd tqt3
../header_rename_1
patch -p0 < ../tqt3_fixups_batch2.diff
../convert_qt_itself_qt3_batch2
+patch -p0 < ../tqt3_fixups_batch3.diff
# Regenerate moc files
cd src/moc/
yacc -d moc.y -o moc_yacc && mv moc_yacc moc_yacc.cpp
flex moc.l
-mv lex.yy.c moc_lex.cpp \ No newline at end of file
+mv lex.yy.c moc_lex.cpp
diff --git a/qt3-tqt3/tqt3_fixups_batch3.diff b/qt3-tqt3/tqt3_fixups_batch3.diff
new file mode 100644
index 0000000..b9c7caa
--- /dev/null
+++ b/qt3-tqt3/tqt3_fixups_batch3.diff
@@ -0,0 +1,12 @@
+diff --git tools/designer/uic/form.cpp tools/designer/uic/form.cpp
+--- tools/designer/uic/form.cpp
++++ tools/designer/uic/form.cpp
+@@ -1414,7 +1414,7 @@ void Uic::createFormImpl( const TQDomElement &e )
+ }
+ }
+
+- out << indent << "qWarning( \"" << nameOfClass << "::" << fname << ": Not implemented yet\" );" << endl;
++ out << indent << "tqWarning( \"" << nameOfClass << "::" << fname << ": Not implemented yet\" );" << endl;
+ if ( !retVal.isEmpty() )
+ out << indent << "return " << retVal << ";" << endl;
+ }