diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/examples/precompile/myobject.cpp | 2 | ||||
| -rw-r--r-- | qmake/examples/precompile/myobject.h | 2 | ||||
| -rw-r--r-- | qmake/generators/makefile.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qmake/examples/precompile/myobject.cpp b/qmake/examples/precompile/myobject.cpp index 14853508a..da24e625d 100644 --- a/qmake/examples/precompile/myobject.cpp +++ b/qmake/examples/precompile/myobject.cpp @@ -1,5 +1,5 @@ #include <iostream> -#include <ntqobject.h> +#include <tqobject.h> #include "myobject.h" MyObject::MyObject() diff --git a/qmake/examples/precompile/myobject.h b/qmake/examples/precompile/myobject.h index 5819267eb..90c0b865b 100644 --- a/qmake/examples/precompile/myobject.h +++ b/qmake/examples/precompile/myobject.h @@ -1,4 +1,4 @@ -#include <ntqobject.h> +#include <tqobject.h> class MyObject : public TQObject { diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index f31c7e085..aa3f6c616 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -132,7 +132,7 @@ MakefileGenerator::generateMocList(const TQString &fn_target) total_size_read += have_read); close(file); - bool ignore_qobject = FALSE; + bool ignore_tqobject = FALSE; int line_count = 1; /* qmake ignore TQ_OBJECT */ #define COMP_LEN 9 //strlen("TQ_OBJECT") @@ -154,7 +154,7 @@ MakefileGenerator::generateMocList(const TQString &fn_target) debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore TQ_OBJECT\"", fn_target.latin1(), line_count); x += 20; - ignore_qobject = TRUE; + ignore_tqobject = TRUE; } } } else if(*(big_buffer + x) == '*') { @@ -177,7 +177,7 @@ MakefileGenerator::generateMocList(const TQString &fn_target) if(interesting) { int len = 0; if(!strncmp(big_buffer+x, "TQ_OBJECT", OBJ_LEN)) { - if(ignore_qobject) { + if(ignore_tqobject) { debug_msg(2, "Mocgen: %s:%d Ignoring TQ_OBJECT", fn_target.latin1(), line_count); interesting = FALSE; } |