From e76d72aec544878d976423e2136e7787aba980ab Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 24 Feb 2012 09:10:52 +0100 Subject: don't generate bogus TARGETs Change-Id: Ia99cd8862157e5630506d02b3c7e9b35d4bc3302 Reviewed-by: Joerg Bornemann --- qmake/generators/projectgenerator.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'qmake/generators') diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 4d1a310daf..a2eb45ef40 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -85,12 +85,6 @@ ProjectGenerator::init() templ.prepend(Option::user_template_prefix); v["TEMPLATE_ASSIGN"] += templ; - //figure out target - if(Option::output.fileName() == "-") - v["TARGET_ASSIGN"] = QStringList("unknown"); - else - v["TARGET_ASSIGN"] = QStringList(QFileInfo(Option::output).baseName()); - //the scary stuff if(project->first("TEMPLATE_ASSIGN") != "subdirs") { QString builtin_regex = project_builtin_regx(); @@ -360,6 +354,12 @@ ProjectGenerator::writeMakefile(QTextStream &t) t << endl << "# Directories" << "\n" << getWritableVar("SUBDIRS"); } else { + //figure out target + QString ofn = QFileInfo(static_cast(t.device())->fileName()).completeBaseName(); + if (ofn.isEmpty() || ofn == "-") + ofn = "unknown"; + project->variables()["TARGET_ASSIGN"] = QStringList(ofn); + t << getWritableVar("TARGET_ASSIGN") << getWritableVar("CONFIG", false) << getWritableVar("CONFIG_REMOVE", false) -- cgit v1.2.3