|
|
@ -118,7 +118,7 @@ diff -ur tools/designer/uic/form.cpp tools/designer/uic/form.cpp
|
|
|
|
forwardDecl += s;
|
|
|
|
forwardDecl += s;
|
|
|
|
- if ( s.mid( 1 ) == "ListBox" || s.mid( 1 ) == "ListView" || s.mid( 1 ) == "IconView" )
|
|
|
|
- if ( s.mid( 1 ) == "ListBox" || s.mid( 1 ) == "ListView" || s.mid( 1 ) == "IconView" )
|
|
|
|
- forwardDecl += "Q" + s.mid( 1 ) + "Item";
|
|
|
|
- forwardDecl += "Q" + s.mid( 1 ) + "Item";
|
|
|
|
+ if ( s.mid( 2 ) == "ListBox" || s.mid( 2 ) == "ListView" || s.mid( 2 ) == "IconView" )
|
|
|
|
+ if ( (s.mid( 2 ) == "ListBox") || (s.mid( 2 ) == "ListView") || (s.mid( 2 ) == "IconView") )
|
|
|
|
+ forwardDecl += "TQ" + s.mid( 2 ) + "Item";
|
|
|
|
+ forwardDecl += "TQ" + s.mid( 2 ) + "Item";
|
|
|
|
if ( s == "TQDataTable" ) { // other convenience classes which are used in TQDataTable signals, and thus should be forward-declared by uic for us
|
|
|
|
if ( s == "TQDataTable" ) { // other convenience classes which are used in TQDataTable signals, and thus should be forward-declared by uic for us
|
|
|
|
forwardDecl += "TQSqlRecord";
|
|
|
|
forwardDecl += "TQSqlRecord";
|
|
|
@ -128,7 +128,7 @@ diff -ur tools/designer/uic/form.cpp tools/designer/uic/form.cpp
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
- if ( name.mid( 1 ) == "ListView" )
|
|
|
|
- if ( name.mid( 1 ) == "ListView" )
|
|
|
|
+ if ( name.mid( 2 ) == "ListView" )
|
|
|
|
+ if (( name.mid( 1 ) == "ListView" ) || ( name.mid( 2 ) == "ListView" ))
|
|
|
|
globalIncludes += "qheader.h";
|
|
|
|
globalIncludes += "qheader.h";
|
|
|
|
if ( name != objClass ) {
|
|
|
|
if ( name != objClass ) {
|
|
|
|
int wid = WidgetDatabase::idFromClassName( name );
|
|
|
|
int wid = WidgetDatabase::idFromClassName( name );
|
|
|
|