diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-13 15:37:55 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-02 11:14:49 +0000 |
| commit | 23ab0d3e6afddb9281fc92015826faf191a8b233 (patch) | |
| tree | 318d97dd1bf7bf018bc6b4e65c76b834a41d24eb /qmake/generators/unix | |
| parent | f9b882b58438421179a9f7016be6ccfb785b00dd (diff) | |
prune vestiges of IMAGES and QMAKE_IMAGE_COLLECTION
this stuff apparently pre-dates rcc.
Change-Id: Iaa58419476c3d20e2801e91dc1881880c741fdc6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 5 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 76e623d1c7..de1950f081 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -378,10 +378,7 @@ QStringList &UnixMakefileGenerator::findDependencies(const QString &file) { QStringList &ret = MakefileGenerator::findDependencies(file); - // Note: The QMAKE_IMAGE_COLLECTION file have all images - // as dependency, so don't add precompiled header then - if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER") - && file != project->first("QMAKE_IMAGE_COLLECTION")) { + if (doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")) { QString header_prefix; if(!project->isEmpty("PRECOMPILED_DIR")) header_prefix = project->first("PRECOMPILED_DIR").toQString(); diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index f5be8717bf..a7c6f22ee7 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -996,8 +996,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") |