diff options
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 6 | ||||
| -rw-r--r-- | qmake/generators/makefile.cpp | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 07224d8c43..ba7d356320 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -461,9 +461,7 @@ ProjectBuilderSources::files(QMakeProject *project) const { QStringList ret = project->values(key); if(key == "QMAKE_INTERNAL_INCLUDED_FILES") { - QString pfile = project->projectFile(); - if(pfile != "(stdin)") - ret.prepend(pfile); + ret.prepend(project->projectFile()); for(int i = 0; i < ret.size(); ++i) { QStringList newret; if(!ret.at(i).endsWith(Option::prf_ext)) @@ -496,7 +494,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) << "\t" << "objects = {" << endl; //MAKE QMAKE equivelant - if(!project->isActiveConfig("no_autoqmake") && project->projectFile() != "(stdin)") { + if (!project->isActiveConfig("no_autoqmake")) { QString mkfile = pbx_dir + Option::dir_sep + "qt_makeqmake.mak"; QFile mkf(mkfile); if(mkf.open(QIODevice::WriteOnly | QIODevice::Text)) { diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 79f9659536..fe389343bf 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -961,8 +961,7 @@ MakefileGenerator::writePrlFile(QTextStream &t) bdir = qmake_getpwd(); t << "QMAKE_PRL_BUILD_DIR = " << bdir << endl; - if(!project->projectFile().isEmpty() && project->projectFile() != "-") - t << "QMAKE_PRO_INPUT = " << project->projectFile().section('/', -1) << endl; + t << "QMAKE_PRO_INPUT = " << project->projectFile().section('/', -1) << endl; if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH")) t << "QMAKE_PRL_SOURCE_DIR = " << project->first("QMAKE_ABSOLUTE_SOURCE_PATH") << endl; @@ -2595,11 +2594,10 @@ MakefileGenerator::writeMakeQmake(QTextStream &t, bool noDummyQmakeAll) << "@$(QMAKE) -prl " << buildArgs() << " " << files.join(" ") << endl; } - QString pfile = project->projectFile(); - if(pfile != "(stdin)") { QString qmake = build_args(); if(!ofile.isEmpty() && !project->isActiveConfig("no_autoqmake")) { - t << escapeFilePath(ofile) << ": " << escapeDependencyPath(fileFixify(pfile)) << " "; + t << escapeFilePath(ofile) << ": " + << escapeDependencyPath(fileFixify(project->projectFile())) << " "; if (Option::mkfile::do_cache) { if (!project->confFile().isEmpty()) t << escapeDependencyPath(fileFixify(project->confFile())) << " "; @@ -2624,7 +2622,6 @@ MakefileGenerator::writeMakeQmake(QTextStream &t, bool noDummyQmakeAll) if (!noDummyQmakeAll) t << "qmake_all: FORCE" << endl << endl; } - } } QFileInfo |