diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-27 14:49:16 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-02 11:14:43 +0000 |
| commit | 4b486cb88c410a006fb528794709ea40dc77ec53 (patch) | |
| tree | 1ea3833022199a49c300f2df456e9ee4038c923d /qmake/generators/unix/unixmake2.cpp | |
| parent | 365eb897130708c3f413f87a866c0240c9c6fb34 (diff) | |
values(foo).first() => first(foo)
Change-Id: Ic5bb8ae3166c76299881970f83d20206bec704bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 149a58459de..f5be8717bf0 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -75,14 +75,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; } @@ -456,7 +456,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"); @@ -1126,9 +1126,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 +1245,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 +1256,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")); |