Remove QMake's -createstub option
This undocumented option was introduced in 69c22301806b56d56cbe5f5076b889ba98e41a2b (old internal history, 2006) to prepare some unspecified change to configure that was never done. Change-Id: I60de731ac9bc6f6424c57574e59e9f6b4f6c5eb3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
parent
2ab3af564c
commit
a3de48eccc
@ -2233,21 +2233,6 @@ MakefileGenerator::writeDummyMakefile(QTextStream &t)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
|
||||||
MakefileGenerator::writeStubMakefile(QTextStream &t)
|
|
||||||
{
|
|
||||||
t << "QMAKE = " << var("QMAKE_QMAKE") << Qt::endl;
|
|
||||||
const ProStringList &qut = project->values("QMAKE_EXTRA_TARGETS");
|
|
||||||
for (ProStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
|
|
||||||
t << *it << " ";
|
|
||||||
//const QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName()));
|
|
||||||
t << "first all clean install distclean uninstall: qmake\n"
|
|
||||||
<< "qmake_all:\n";
|
|
||||||
writeMakeQmake(t);
|
|
||||||
t << "FORCE:\n\n";
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
MakefileGenerator::writeMakefile(QTextStream &t)
|
MakefileGenerator::writeMakefile(QTextStream &t)
|
||||||
{
|
{
|
||||||
|
@ -90,7 +90,6 @@ protected:
|
|||||||
void writeExtraCompilerTargets(QTextStream &t);
|
void writeExtraCompilerTargets(QTextStream &t);
|
||||||
void writeExtraCompilerVariables(QTextStream &t);
|
void writeExtraCompilerVariables(QTextStream &t);
|
||||||
bool writeDummyMakefile(QTextStream &t);
|
bool writeDummyMakefile(QTextStream &t);
|
||||||
virtual bool writeStubMakefile(QTextStream &t);
|
|
||||||
virtual bool writeMakefile(QTextStream &t);
|
virtual bool writeMakefile(QTextStream &t);
|
||||||
virtual void writeDefaultVariables(QTextStream &t);
|
virtual void writeDefaultVariables(QTextStream &t);
|
||||||
|
|
||||||
|
@ -42,7 +42,6 @@ class UnixMakefileGenerator : public MakefileGenerator
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool doPrecompiledHeaders() const { return project->isActiveConfig("precompile_header"); }
|
virtual bool doPrecompiledHeaders() const { return project->isActiveConfig("precompile_header"); }
|
||||||
bool doDepends() const override { return !Option::mkfile::do_stub_makefile && MakefileGenerator::doDepends(); }
|
|
||||||
#ifdef Q_OS_WIN // MinGW x-compiling for QNX
|
#ifdef Q_OS_WIN // MinGW x-compiling for QNX
|
||||||
QString installRoot() const override;
|
QString installRoot() const override;
|
||||||
#endif
|
#endif
|
||||||
|
@ -66,8 +66,6 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
|
|||||||
if (project->first("TEMPLATE") == "app" ||
|
if (project->first("TEMPLATE") == "app" ||
|
||||||
project->first("TEMPLATE") == "lib" ||
|
project->first("TEMPLATE") == "lib" ||
|
||||||
project->first("TEMPLATE") == "aux") {
|
project->first("TEMPLATE") == "aux") {
|
||||||
if(Option::mkfile::do_stub_makefile && MakefileGenerator::writeStubMakefile(t))
|
|
||||||
return true;
|
|
||||||
writeMakeParts(t);
|
writeMakeParts(t);
|
||||||
return MakefileGenerator::writeMakefile(t);
|
return MakefileGenerator::writeMakefile(t);
|
||||||
} else if (project->first("TEMPLATE") == "subdirs") {
|
} else if (project->first("TEMPLATE") == "subdirs") {
|
||||||
|
@ -93,18 +93,6 @@ bool MingwMakefileGenerator::writeMakefile(QTextStream &t)
|
|||||||
project->first("TEMPLATE") == "aux") {
|
project->first("TEMPLATE") == "aux") {
|
||||||
if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib")
|
if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib")
|
||||||
writePkgConfigFile();
|
writePkgConfigFile();
|
||||||
|
|
||||||
if(Option::mkfile::do_stub_makefile) {
|
|
||||||
t << "QMAKE = " << var("QMAKE_QMAKE") << Qt::endl;
|
|
||||||
const ProStringList &qut = project->values("QMAKE_EXTRA_TARGETS");
|
|
||||||
for (ProStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
|
|
||||||
t << escapeDependencyPath(*it) << ' ';
|
|
||||||
t << "first all clean install distclean uninstall: qmake\n"
|
|
||||||
<< "qmake_all:\n";
|
|
||||||
writeMakeQmake(t);
|
|
||||||
t << "FORCE:\n\n";
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
writeMingwParts(t);
|
writeMingwParts(t);
|
||||||
return MakefileGenerator::writeMakefile(t);
|
return MakefileGenerator::writeMakefile(t);
|
||||||
}
|
}
|
||||||
|
@ -48,10 +48,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
|
|||||||
if(project->first("TEMPLATE") == "app" ||
|
if(project->first("TEMPLATE") == "app" ||
|
||||||
project->first("TEMPLATE") == "lib" ||
|
project->first("TEMPLATE") == "lib" ||
|
||||||
project->first("TEMPLATE") == "aux") {
|
project->first("TEMPLATE") == "aux") {
|
||||||
#if 0
|
|
||||||
if(Option::mkfile::do_stub_makefile)
|
|
||||||
return MakefileGenerator::writeStubMakefile(t);
|
|
||||||
#endif
|
|
||||||
writeNmakeParts(t);
|
writeNmakeParts(t);
|
||||||
return MakefileGenerator::writeMakefile(t);
|
return MakefileGenerator::writeMakefile(t);
|
||||||
}
|
}
|
||||||
|
@ -93,7 +93,6 @@ bool Option::mkfile::do_deps = true;
|
|||||||
bool Option::mkfile::do_mocs = true;
|
bool Option::mkfile::do_mocs = true;
|
||||||
bool Option::mkfile::do_dep_heuristics = true;
|
bool Option::mkfile::do_dep_heuristics = true;
|
||||||
bool Option::mkfile::do_preprocess = false;
|
bool Option::mkfile::do_preprocess = false;
|
||||||
bool Option::mkfile::do_stub_makefile = false;
|
|
||||||
QStringList Option::mkfile::project_files;
|
QStringList Option::mkfile::project_files;
|
||||||
|
|
||||||
static Option::QMAKE_MODE default_mode(QString progname)
|
static Option::QMAKE_MODE default_mode(QString progname)
|
||||||
@ -254,8 +253,6 @@ Option::parseCommandLine(QStringList &args, QMakeCmdLineParserState &state)
|
|||||||
Option::mkfile::do_deps = false;
|
Option::mkfile::do_deps = false;
|
||||||
} else if (arg == "-nomoc") {
|
} else if (arg == "-nomoc") {
|
||||||
Option::mkfile::do_mocs = false;
|
Option::mkfile::do_mocs = false;
|
||||||
} else if (arg == "-createstub") {
|
|
||||||
Option::mkfile::do_stub_makefile = true;
|
|
||||||
} else if (arg == "-nodependheuristics") {
|
} else if (arg == "-nodependheuristics") {
|
||||||
Option::mkfile::do_dep_heuristics = false;
|
Option::mkfile::do_dep_heuristics = false;
|
||||||
} else if (arg == "-E") {
|
} else if (arg == "-E") {
|
||||||
|
@ -189,7 +189,6 @@ struct Option
|
|||||||
static bool do_mocs;
|
static bool do_mocs;
|
||||||
static bool do_dep_heuristics;
|
static bool do_dep_heuristics;
|
||||||
static bool do_preprocess;
|
static bool do_preprocess;
|
||||||
static bool do_stub_makefile;
|
|
||||||
static int cachefile_depth;
|
static int cachefile_depth;
|
||||||
static QStringList project_files;
|
static QStringList project_files;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user