diff options
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 469f23340d2..04423ec9af0 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -38,13 +38,12 @@ #include <qbytearray.h> #include <qfile.h> #include <qdir.h> -#include <qdatetime.h> #include <qdebug.h> #include <time.h> QT_BEGIN_NAMESPACE -UnixMakefileGenerator::UnixMakefileGenerator() : MakefileGenerator(), init_flag(false), include_deps(false) +UnixMakefileGenerator::UnixMakefileGenerator() : MakefileGenerator(), include_deps(false) { } @@ -75,14 +74,14 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t) if (writeDummyMakefile(t)) return true; - if (project->values("TEMPLATE").first() == "app" || - project->values("TEMPLATE").first() == "lib" || - project->values("TEMPLATE").first() == "aux") { + if (project->first("TEMPLATE") == "app" || + project->first("TEMPLATE") == "lib" || + project->first("TEMPLATE") == "aux") { if(Option::mkfile::do_stub_makefile && MakefileGenerator::writeStubMakefile(t)) return true; writeMakeParts(t); return MakefileGenerator::writeMakefile(t); - } else if(project->values("TEMPLATE").first() == "subdirs") { + } else if (project->first("TEMPLATE") == "subdirs") { MakefileGenerator::writeSubDirs(t); return true; } @@ -167,7 +166,7 @@ UnixMakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator:: void UnixMakefileGenerator::writeMakeParts(QTextStream &t) { - QString deps = fileFixify(Option::output.fileName()), target_deps, prl; + QString deps = fileFixify(Option::output.fileName()), target_deps; bool do_incremental = (project->isActiveConfig("incremental") && !project->values("QMAKE_INCREMENTAL").isEmpty() && (!project->values("QMAKE_APP_FLAG").isEmpty() || @@ -456,7 +455,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) } else { //actual target QString incr_target_dir = var("DESTDIR") + "lib" + incr_target + "." + - project->values("QMAKE_EXTENSION_SHLIB").first(); + project->first("QMAKE_EXTENSION_SHLIB"); QString incr_lflags = var("QMAKE_LFLAGS_SHLIB") + " "; if(project->isActiveConfig("debug")) incr_lflags += var("QMAKE_LFLAGS_DEBUG"); @@ -714,7 +713,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << destdir << "$(TARGET): " << var("PRE_TARGETDEPS") << " " << var("POST_TARGETDEPS") << valList(build) << "\n\t"; ar = project->first("QMAKE_AR_CMD").toQString(); - ar = ar.replace("$(OBJECTS)", build.join(' ')); + ar.replace("$(OBJECTS)", build.join(' ')); } else { t << (*libit) << ": " << valList(build) << "\n\t"; ar = "$(AR) " + (*libit) + " " + build.join(' '); @@ -996,8 +995,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) } t << "-$(DEL_FILE) " << precomp_files.join(' ') << "\n\t"; } - if(!project->isEmpty("IMAGES")) - t << varGlue("QMAKE_IMAGE_COLLECTION", "\t-$(DEL_FILE) ", " ", "") << "\n\t"; if(src_incremental) t << "-$(DEL_FILE) $(INCREMENTAL_OBJECTS)\n\t"; t << varGlue("QMAKE_CLEAN","-$(DEL_FILE) "," ","\n\t") @@ -1077,8 +1074,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) << "\n\techo \"// Automatically generated, do not modify\" > " << sourceFile << "\n\trm -f " << pchOutput; - pchFlags = pchFlags.replace("${QMAKE_PCH_TEMP_SOURCE}", sourceFile) - .replace("${QMAKE_PCH_TEMP_OBJECT}", objectFile); + pchFlags.replace("${QMAKE_PCH_TEMP_SOURCE}", sourceFile) + .replace("${QMAKE_PCH_TEMP_OBJECT}", objectFile); } else { // gcc style (including clang_pch_style) ProString header_prefix = project->first("QMAKE_PRECOMP_PREFIX"); @@ -1104,9 +1101,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << pchOutput << ": " << pchInput << " " << findDependencies(pchInput).join(" \\\n\t\t") << "\n\t" << mkdir_p_asstring(pchOutputDir); } - pchFlags = pchFlags.replace("${QMAKE_PCH_INPUT}", pchInput) - .replace("${QMAKE_PCH_OUTPUT_BASE}", pchBaseName.toQString()) - .replace("${QMAKE_PCH_OUTPUT}", pchOutput.toQString()); + pchFlags.replace("${QMAKE_PCH_INPUT}", pchInput) + .replace("${QMAKE_PCH_OUTPUT_BASE}", pchBaseName.toQString()) + .replace("${QMAKE_PCH_OUTPUT}", pchOutput.toQString()); QString compiler; if(comps[i] == "C" || comps[i] == "OBJC" || comps[i] == "OBJCXX") @@ -1126,9 +1123,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) void UnixMakefileGenerator::init2() { if(project->isEmpty("QMAKE_FRAMEWORK_VERSION")) - project->values("QMAKE_FRAMEWORK_VERSION").append(project->values("VER_MAJ").first()); + project->values("QMAKE_FRAMEWORK_VERSION").append(project->first("VER_MAJ")); - if (project->values("TEMPLATE").first() == "aux") + if (project->first("TEMPLATE") == "aux") return; if (!project->values("QMAKE_APP_FLAG").isEmpty()) { @@ -1245,7 +1242,7 @@ void UnixMakefileGenerator::init2() project->first("VER_MAJ") + "." + project->first("VER_MIN") + "." + project->first("VER_PAT") + "." + - project->values("QMAKE_EXTENSION_SHLIB").first()); + project->first("QMAKE_EXTENSION_SHLIB")); } else { project->values("TARGET_x").append("lib" + project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_SHLIB") + @@ -1256,8 +1253,8 @@ void UnixMakefileGenerator::init2() "." + project->first("VER_MIN")); project->values("TARGET_x.y.z").append("lib" + project->first("TARGET") + "." + - project->values( - "QMAKE_EXTENSION_SHLIB").first() + "." + + project->first( + "QMAKE_EXTENSION_SHLIB") + "." + project->first("VER_MAJ") + "." + project->first("VER_MIN") + "." + project->first("VER_PAT")); @@ -1387,7 +1384,7 @@ UnixMakefileGenerator::writeLibtoolFile() QTextStream t(&ft); t << "# " << lname << " - a libtool library file\n"; t << "# Generated by qmake/libtool (" QMAKE_VERSION_STR ") (Qt " - << QT_VERSION_STR << ") on: " << QDateTime::currentDateTime().toString(); + << QT_VERSION_STR << ")"; t << "\n"; t << "# The name that we can dlopen(3).\n" |