You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
1.0 KiB
25 lines
1.0 KiB
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 + "\" )";
|