diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2011-05-03 13:30:28 (GMT) |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@nokia.com> | 2011-05-03 13:30:28 (GMT) |
| commit | 56443421cb5e537e60abd7ced42c9ebf587683fe (patch) | |
| tree | 7530dac7620781ffd0ced37cd1824a611b427e72 /qmake/generators/unix | |
| parent | 62e73a463cb7035192acdce6538c5b0248e643d4 (diff) | |
| download | Qt-56443421cb5e537e60abd7ced42c9ebf587683fe.zip Qt-56443421cb5e537e60abd7ced42c9ebf587683fe.tar.gz Qt-56443421cb5e537e60abd7ced42c9ebf587683fe.tar.bz2 | |
qmake: Introduce new template type
The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point).
Reviewed-by: Joerg Bornemann
Diffstat (limited to 'qmake/generators/unix')
| -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"); |