Add additional patchfile

pull/1/head
Timothy Pearson 13 years ago
parent 45c27365b0
commit ce5b2d26ac

@ -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

@ -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 + "\" )";
Loading…
Cancel
Save