diff options
Diffstat (limited to 'qmake/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index dad6ca7d4..4a3b22785 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -244,7 +244,7 @@ UnixMakefileGenerator::init() project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"]; } if ( project->isActiveConfig("moc") ) - setMocAware(TRUE); + setTQMocAware(TRUE); TQString compile_flag = var("QMAKE_COMPILE_FLAG"); if(compile_flag.isEmpty()) compile_flag = "-c"; diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 347186d75..c117a2d29 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -687,7 +687,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) //moc itself shouldn't have this dependency - this is a little kludgy but it is //better than the alternative for now. TQString moc = project->first("QMAKE_MOC"), target = project->first("TARGET"), - moc_dir = "$(TQTDIR)/src/moc"; + moc_dir = "$(TQTDIR)/src/tqmoc"; if(!project->isEmpty("QMAKE_MOC_SRC")) moc_dir = project->first("QMAKE_MOC_SRC"); fixEnvVariables(target); @@ -777,7 +777,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) TQString clean_targets; t << "mocclean:" << "\n"; - if(mocAware()) { + if(tqmocAware()) { if(!objMoc.isEmpty() || !srcMoc.isEmpty() || moc_incremental) { if(!objMoc.isEmpty()) t << "\t-$(DEL_FILE) $(OBJMOC)" << '\n'; |