diff options
| author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-05-09 12:18:02 (GMT) |
|---|---|---|
| committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-05-09 12:18:02 (GMT) |
| commit | fa53804c12e692d29421e22e2c59f6aff2d519e7 (patch) | |
| tree | 00c6f99ab439e4f75fb52ae48ad8589120965813 /qmake/generators/unix/unixmake2.cpp | |
| parent | 97e423b50d316c3a9e2083c3a9d80bf16554faa9 (diff) | |
| parent | f57395a27730cbf464b7f9293bcf058a0a481a98 (diff) | |
| download | Qt-fa53804c12e692d29421e22e2c59f6aff2d519e7.zip Qt-fa53804c12e692d29421e22e2c59f6aff2d519e7.tar.gz Qt-fa53804c12e692d29421e22e2c59f6aff2d519e7.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 9f14492..82f2366 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -96,7 +96,8 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t) } if (project->values("TEMPLATE").first() == "app" || - project->values("TEMPLATE").first() == "lib") { + project->values("TEMPLATE").first() == "lib" || + project->values("TEMPLATE").first() == "aux") { if(Option::mkfile::do_stub_makefile && MakefileGenerator::writeStubMakefile(t)) return true; writeMakeParts(t); @@ -1017,6 +1018,9 @@ void UnixMakefileGenerator::init2() if(project->isEmpty("QMAKE_FRAMEWORK_VERSION")) project->values("QMAKE_FRAMEWORK_VERSION").append(project->values("VER_MAJ").first()); + if (project->values("TEMPLATE").first() == "aux") + return; + if (!project->values("QMAKE_APP_FLAG").isEmpty()) { if(!project->isEmpty("QMAKE_BUNDLE")) { QString bundle_loc = project->first("QMAKE_BUNDLE_LOCATION"); |