diff options
Diffstat (limited to 'qmake/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 3 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 1c95392932..ea6a6a6e90 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -818,7 +818,8 @@ UnixMakefileGenerator::defaultInstall(const QString &t) if(project->first("TEMPLATE") == "lib" && project->isActiveConfig("staticlib")) { if(!project->isEmpty("QMAKE_RANLIB")) ret += QString("\n\t$(RANLIB) \"") + dst_targ + "\""; - } else if(!project->isActiveConfig("debug") && !project->isActiveConfig("nostrip") && !project->isEmpty("QMAKE_STRIP")) { + } else if (!project->isActiveConfig("debug_info") && !project->isActiveConfig("nostrip") + && !project->isEmpty("QMAKE_STRIP")) { ret += "\n\t-$(STRIP)"; if (project->first("TEMPLATE") == "lib") { if (!project->isEmpty("QMAKE_STRIPFLAGS_LIB")) diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 35639a33bf..7ed89e23d7 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -403,6 +403,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) QString incr_lflags = var("QMAKE_LFLAGS_SHLIB") + " "; if(project->isActiveConfig("debug")) incr_lflags += var("QMAKE_LFLAGS_DEBUG"); + else if (project->isActiveConfig("debug_info")) + incr_lflags += var("QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO"); else incr_lflags += var("QMAKE_LFLAGS_RELEASE"); t << incr_target_dir << ": $(INCREMENTAL_OBJECTS)\n\t"; @@ -498,6 +500,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) incr_lflags += var("QMAKE_LFLAGS_INCREMENTAL") + " "; if(project->isActiveConfig("debug")) incr_lflags += var("QMAKE_LFLAGS_DEBUG"); + else if (project->isActiveConfig("debug_info")) + incr_lflags += var("QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO"); else incr_lflags += var("QMAKE_LFLAGS_RELEASE"); t << incr_target_dir << ": $(INCREMENTAL_OBJECTS)\n\t"; |