diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-12 22:13:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-12 22:13:37 -0600 |
| commit | ccbd5a505a751d4b446881cede7ba077428a260f (patch) | |
| tree | 891f6438408771371769b62a01b0d8382dd48e34 | |
| parent | 6555c26d81d07f564a69105213a4aaa94e3135df (diff) | |
| download | experimental-ccbd5a505a751d4b446881cede7ba077428a260f.tar.gz experimental-ccbd5a505a751d4b446881cede7ba077428a260f.zip | |
Final update to conversion scripts for this batch
| -rwxr-xr-x | qt3-tqt3/create_tqt3_from_qt3 | 1 | ||||
| -rw-r--r-- | qt3-tqt3/tqt3_fixups_batch2.diff | 25 |
2 files changed, 25 insertions, 1 deletions
diff --git a/qt3-tqt3/create_tqt3_from_qt3 b/qt3-tqt3/create_tqt3_from_qt3 index 2f04ea7..ae1b593 100755 --- a/qt3-tqt3/create_tqt3_from_qt3 +++ b/qt3-tqt3/create_tqt3_from_qt3 @@ -7,6 +7,7 @@ cd tqt3 patch -p0 < ../tqt3_fixups_batch2.diff ../convert_qt_itself_qt3_batch2 +# Regenerate moc files cd src/moc/ yacc -d moc.y -o moc_yacc && mv moc_yacc moc_yacc.cpp flex moc.l diff --git a/qt3-tqt3/tqt3_fixups_batch2.diff b/qt3-tqt3/tqt3_fixups_batch2.diff index 23f1f5c..1e8d4dd 100644 --- a/qt3-tqt3/tqt3_fixups_batch2.diff +++ b/qt3-tqt3/tqt3_fixups_batch2.diff @@ -16,9 +16,32 @@ diff --git 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; |