diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
| commit | 359640943bcf155faa9a067dde9e00a123276290 (patch) | |
| tree | fb3d55ea5e18949042fb0064123fb73d2b1eb932 /qmake/generators | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/makefile.cpp | 22 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 476e9f9bf..b4348588c 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -134,9 +134,9 @@ MakefileGenerator::generateMocList(const TQString &fn_target) 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") + /* qmake ignore TQ_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++) { @@ -150,8 +150,8 @@ MakefileGenerator::generateMocList(const TQString &fn_target) for( ;x < total_size_read; x++) { if(*(big_buffer + x) == 't' || *(big_buffer + x) == 'q') { //ignore if(total_size_read >= (x + 20)) { - if(!strncmp(big_buffer + x + 1, "make ignore Q_OBJECT", 20)) { - debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_OBJECT\"", + if(!strncmp(big_buffer + x + 1, "make ignore TQ_OBJECT", 20)) { + debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore TQ_OBJECT\"", fn_target.latin1(), line_count); x += 20; ignore_qobject = TRUE; @@ -172,13 +172,13 @@ MakefileGenerator::generateMocList(const TQString &fn_target) #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; - if(!strncmp(big_buffer+x, "Q_OBJECT", OBJ_LEN)) { + if(!strncmp(big_buffer+x, "TQ_OBJECT", OBJ_LEN)) { if(ignore_qobject) { - debug_msg(2, "Mocgen: %s:%d Ignoring Q_OBJECT", fn_target.latin1(), line_count); + debug_msg(2, "Mocgen: %s:%d Ignoring TQ_OBJECT", fn_target.latin1(), line_count); interesting = FALSE; } len=OBJ_LEN; @@ -2101,14 +2101,14 @@ TQString MakefileGenerator::buildArgs() //arguments for(TQStringList::Iterator it = Option::before_user_vars.begin(); it != Option::before_user_vars.end(); ++it) { - if((*it).left(qstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH") + if((*it).left(tqstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH") ret += " \"" + (*it) + "\""; } if(Option::after_user_vars.count()) { ret += " -after "; for(TQStringList::Iterator it = Option::after_user_vars.begin(); it != Option::after_user_vars.end(); ++it) { - if((*it).left(qstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH") + if((*it).left(tqstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH") ret += " \"" + (*it) + "\""; } } @@ -2145,7 +2145,7 @@ MakefileGenerator::writeHeader(TQTextStream &t) time_t foo = time(NULL); t << "#############################################################################" << endl; t << "# Makefile for building: " << var("TARGET") << endl; - t << "# Generated by qmake (" << qmake_version() << ") (TQt " << QT_VERSION_STR << ") on: " << ctime(&foo); + t << "# Generated by qmake (" << qmake_version() << ") (TQt " << TQT_VERSION_STR << ") on: " << ctime(&foo); t << "# Project: " << fileFixify(project->projectFile()) << endl; t << "# Template: " << var("TEMPLATE") << endl; t << "# Command: " << build_args() << endl; diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index edaa8d131..798edc260 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1433,7 +1433,7 @@ UnixMakefileGenerator::writeLibtoolFile() t << "# " << lname << " - a libtool library file\n"; time_t now = time(NULL); t << "# Generated by qmake/libtool (" << qmake_version() << ") (TQt " - << QT_VERSION_STR << ") on: " << ctime(&now) << "\n"; + << TQT_VERSION_STR << ") on: " << ctime(&now) << "\n"; t << "# The name that we can dlopen(3).\n" << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x") |