diff options
author | Timothy Pearson <[email protected]> | 2012-01-27 18:24:16 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-01-27 18:24:16 -0600 |
commit | 56c8184edb6fcc7ed28f139739d551c02831e1fa (patch) | |
tree | ba330f5ce42785f9a470d82d5b3fe5693669f74c | |
parent | ea318d1431c89e647598c510c4245c6571aa5f46 (diff) | |
download | tqt3-56c8184edb6fcc7ed28f139739d551c02831e1fa.tar.gz tqt3-56c8184edb6fcc7ed28f139739d551c02831e1fa.zip |
Automated update
-rw-r--r-- | tools/designer/shared/widgetdatabase.cpp | 2 | ||||
-rw-r--r-- | tools/designer/uic/uic.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp index 45e898ad5..bdda59323 100644 --- a/tools/designer/shared/widgetdatabase.cpp +++ b/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 a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp index 59a9a1d1d..305f7133e 100644 --- a/tools/designer/uic/uic.cpp +++ b/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 + "\" )"; |