diff options
Diffstat (limited to 'qmake/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 16 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index d018904ce..758634b34 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -163,10 +163,10 @@ UnixMakefileGenerator::init() configs.append("qtopiainc"); } if ( project->isActiveConfig("qtopiainc") ) - project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"]; + project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQTOPIA"]; if ( project->isActiveConfig("qtopialib") ) { - if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA")) - project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QTOPIA", "-L", " -L", ""); + if(!project->isEmpty("QMAKE_LIBDIR_TQTOPIA")) + project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_TQTOPIA", "-L", " -L", ""); project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"]; } if ( project->isActiveConfig("qt") ) { @@ -175,7 +175,7 @@ UnixMakefileGenerator::init() if ( project->isActiveConfig("tablet") ) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT"); if(configs.findIndex("moc")) configs.append("moc"); - project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"]; + project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"]; if ( !project->isActiveConfig("debug") ) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); if ( !is_qt ) { @@ -183,12 +183,12 @@ UnixMakefileGenerator::init() if ( !project->isEmpty("QMAKE_RTLDIR_QT") ) project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_RTLDIR_QT", " " + var("QMAKE_RPATH"), " " + var("QMAKE_RPATH"), ""); - else if ( !project->isEmpty("QMAKE_LIBDIR_QT") ) - project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_LIBDIR_QT", " " + var("QMAKE_RPATH"), + else if ( !project->isEmpty("QMAKE_LIBDIR_TQT") ) + project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_LIBDIR_TQT", " " + var("QMAKE_RPATH"), " " + var("QMAKE_RPATH"), ""); } - if ( !project->isEmpty("QMAKE_LIBDIR_QT") ) - project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", "-L", " -L", ""); + if ( !project->isEmpty("QMAKE_LIBDIR_TQT") ) + project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_TQT", "-L", " -L", ""); if ( project->isActiveConfig("thread") && !project->isEmpty("QMAKE_LIBS_QT_THREAD") ) project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; else diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 7427269f4..48e6ef545 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 = "$(QTDIR)/src/moc"; + moc_dir = "$(TQTDIR)/src/moc"; if(!project->isEmpty("QMAKE_MOC_SRC")) moc_dir = project->first("QMAKE_MOC_SRC"); fixEnvVariables(target); |