From ce5b2d26ac4ca4f90a8de5d5bb0c05c5c7ffb01a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 27 Jan 2012 18:22:56 -0600
Subject: [PATCH] Add additional patchfile

---
 qt3-tqt3/create_tqt3_from_qt3    |  1 +
 qt3-tqt3/tqt3_fixups_batch2.diff | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 qt3-tqt3/tqt3_fixups_batch2.diff

diff --git a/qt3-tqt3/create_tqt3_from_qt3 b/qt3-tqt3/create_tqt3_from_qt3
index 65a0bb3..f86d72f 100755
--- a/qt3-tqt3/create_tqt3_from_qt3
+++ b/qt3-tqt3/create_tqt3_from_qt3
@@ -4,3 +4,4 @@ cp -Rp ../../main/dependencies/qt3/ tqt3
 cd tqt3
 ../convert_qt_itself_qt3
 ../header_rename_1
+patch -p0 < ../tqt3_fixups_batch2.diff
diff --git a/qt3-tqt3/tqt3_fixups_batch2.diff b/qt3-tqt3/tqt3_fixups_batch2.diff
new file mode 100644
index 0000000..23f1f5c
--- /dev/null
+++ b/qt3-tqt3/tqt3_fixups_batch2.diff
@@ -0,0 +1,24 @@
+diff --git tools/designer/shared/widgetdatabase.cpp tools/designer/shared/widgetdatabase.cpp
+--- tools/designer/shared/widgetdatabase.cpp
++++ tools/designer/shared/widgetdatabase.cpp
+@@ -723,7 +723,7 @@ TQString WidgetDatabase::includeFile( int id )
+ 	TQString rq = r->name;
+ 	if ( rq[ 0 ] == 'T' && rq[ 1 ] == 'Q')
+ 	    rq = rq.mid(1);
+-	return rq.lower() + ".h";
++	return "nt" + rq.lower() + ".h";
+     }
+     return r->includeFile;
+ }
+diff --git tools/designer/uic/uic.cpp tools/designer/uic/uic.cpp
+--- tools/designer/uic/uic.cpp
++++ tools/designer/uic/uic.cpp
+@@ -1114,7 +1114,7 @@ TQStringList Uic::unique( const TQStringList& list )
+ TQString Uic::createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName )
+ {
+ 
+-    if ( objClass.mid( 1 ) == "ComboBox" ) {
++    if (( objClass.mid( 1 ) == "ComboBox" ) || ( objClass.mid( 2 ) == "ComboBox" )) {
+ 	return objClass + "( FALSE, " + parent + ", \"" + objName + "\" )";
+     }
+     return objClass + "( " + parent + ", \"" + objName + "\" )";