|
|
|
|
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 + "\" )";
|
|
|
|
|
diff --git qmake/generators/makefile.cpp qmake/generators/makefile.cpp
|
|
|
|
|
--- qmake/generators/makefile.cpp
|
|
|
|
|
+++ qmake/generators/makefile.cpp
|
|
|
|
|
@@ -135,8 +135,8 @@
|
|
|
|
|
bool ignore_qobject = FALSE;
|
|
|
|
|
int line_count = 1;
|
|
|
|
|
/* qmake ignore Q_OBJECT */
|
|
|
|
|
-#define COMP_LEN 8 //strlen("Q_OBJECT")
|
|
|
|
|
-#define OBJ_LEN 8 //strlen("Q_OBJECT")
|
|
|
|
|
+#define COMP_LEN 9 //strlen("TQ_OBJECT")
|
|
|
|
|
+#define OBJ_LEN 9 //strlen("TQ_OBJECT")
|
|
|
|
|
#define DIS_LEN 10 //strlen("Q_DISPATCH")
|
|
|
|
|
int x;
|
|
|
|
|
for(x = 0; x < (total_size_read-COMP_LEN); x++) {
|
|
|
|
|
@@ -172,7 +172,7 @@
|
|
|
|
|
#define SYMBOL_CHAR(x) ((x >= 'a' && x <= 'z') || (x >= 'A' && x <= 'Z') || \
|
|
|
|
|
(x <= '0' && x >= '9') || x == '_')
|
|
|
|
|
|
|
|
|
|
- bool interesting = *(big_buffer+x) == 'Q' && (!strncmp(big_buffer+x, "Q_OBJECT", OBJ_LEN) ||
|
|
|
|
|
+ bool interesting = ((*(big_buffer+x) == 'T') || (*(big_buffer+x) == 'Q')) && (!strncmp(big_buffer+x, "TQ_OBJECT", OBJ_LEN) ||
|
|
|
|
|
!strncmp(big_buffer+x, "Q_DISPATCH", DIS_LEN));
|
|
|
|
|
if(interesting) {
|
|
|
|
|
int len = 0;
|
