summaryrefslogtreecommitdiffstats
path: root/qt3-tqt3/tqt3_fixups_batch2.diff
blob: 23f1f5ce6f679f237526394f60394e21483c974f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
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 + "\" )";