1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prune vestiges of IMAGES and QMAKE_IMAGE_COLLECTION

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2014-11-13 15:37:55 +01:00
parent f9b882b584
commit 23ab0d3e6a
6 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -750,7 +750,6 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
mkt << endl;
mkt << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl;
mkt << "MOVE = " << var("QMAKE_MOVE") << endl << endl;
mkt << "IMAGES = " << varList("QMAKE_IMAGE_COLLECTION") << endl;
mkt << "PARSERS =";
if(!project->isEmpty("YACCSOURCES")) {
const ProStringList &yaccs = project->values("YACCSOURCES");

5
qmake/generators/unix/unixmake.cpp
View File

@ -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();

2
qmake/generators/unix/unixmake2.cpp
View File

@ -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")

5
qmake/generators/win32/mingw_make.cpp
View File

@ -420,10 +420,7 @@ void MingwMakefileGenerator::writeRcFilePart(QTextStream &t)
QStringList &MingwMakefileGenerator::findDependencies(const QString &file)
{
QStringList &aList = MakefileGenerator::findDependencies(file);
// Note: The QMAKE_IMAGE_COLLECTION file have all images
// as dependency, so don't add precompiled header then
if (file == project->first("QMAKE_IMAGE_COLLECTION")
|| preCompHeaderOut.isEmpty())
if (preCompHeaderOut.isEmpty())
return aList;
for (QStringList::Iterator it = Option::c_ext.begin(); it != Option::c_ext.end(); ++it) {
if (file.endsWith(*it)) {

4
qmake/generators/win32/msvc_nmake.cpp
View File

@ -278,10 +278,6 @@ QString NmakeMakefileGenerator::defaultInstall(const QString &t)
QStringList &NmakeMakefileGenerator::findDependencies(const QString &file)
{
QStringList &aList = MakefileGenerator::findDependencies(file);
// Note: The QMAKE_IMAGE_COLLECTION file have all images
// as dependency, so don't add precompiled header then
if (file == project->first("QMAKE_IMAGE_COLLECTION"))
return aList;
for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
if(file.endsWith(*it)) {
if(!precompObj.isEmpty() && !aList.contains(precompObj))

4
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -1430,7 +1430,6 @@ void VcprojGenerator::initGeneratedFiles()
vcProject.GeneratedFiles.addFiles(project->values("IDLSOURCES"));
if (project->values("RC_FILE").isEmpty())
vcProject.GeneratedFiles.addFiles(project->values("RES_FILE"));
vcProject.GeneratedFiles.addFiles(project->values("QMAKE_IMAGE_COLLECTION")); // compat
if(!extraCompilerOutputs.isEmpty())
vcProject.GeneratedFiles.addFiles(extraCompilerOutputs.keys());
@ -1520,7 +1519,6 @@ void VcprojGenerator::initResourceFiles()
// You may look again --------------------------------------------
vcProject.ResourceFiles.addFiles(project->values("RESOURCES"));
vcProject.ResourceFiles.addFiles(project->values("IMAGES"));
vcProject.ResourceFiles.Project = this;
vcProject.ResourceFiles.Config = &(vcProject.Configuration);
@ -1534,9 +1532,7 @@ void VcprojGenerator::initExtraCompilerOutputs()
<< "GENERATED_SOURCES"
<< "HEADERS"
<< "IDLSOURCES"
<< "IMAGES"
<< "LEXSOURCES"
<< "QMAKE_IMAGE_COLLECTION"
<< "RC_FILE"
<< "RESOURCES"
<< "RES_FILE"