summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-11-13 15:54:50 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-04 16:32:48 +0000
commit5629187697fb2a66e7bbf2b5b2993c8bac94e3a4 (patch)
tree389a705286ef45d31a9d31a43b12f22d0e482d9a /qmake
parent68c750dd4bd4c20308d56023d6fa63051d2031d7 (diff)
xcode: remove special treatment of YACCSOURCES and LEXSOURCES
we (supposedly) fully support QMAKE_EXTRA_COMPILERS, so there is no need for any special casing here. Change-Id: I4e9d389320a3e5ad0acbf73823ff1e6f7b9c370f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/mac/pbuilder_pbx.cpp25
1 files changed, 2 insertions, 23 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index d99c1659b8..e902aa5408 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -750,29 +750,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
mkt << endl;
mkt << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl;
mkt << "MOVE = " << var("QMAKE_MOVE") << endl << endl;
- mkt << "PARSERS =";
- if(!project->isEmpty("YACCSOURCES")) {
- const ProStringList &yaccs = project->values("YACCSOURCES");
- for (ProStringList::ConstIterator yit = yaccs.begin(); yit != yaccs.end(); ++yit) {
- QFileInfo fi(fileInfo((*yit).toQString()));
- mkt << " " << fi.path() << Option::dir_sep << fi.baseName()
- << Option::yacc_mod << Option::cpp_ext.first();
- }
- }
- if(!project->isEmpty("LEXSOURCES")) {
- const ProStringList &lexs = project->values("LEXSOURCES");
- for (ProStringList::ConstIterator lit = lexs.begin(); lit != lexs.end(); ++lit) {
- QFileInfo fi(fileInfo((*lit).toQString()));
- mkt << " " << fi.path() << Option::dir_sep << fi.baseName()
- << Option::lex_mod << Option::cpp_ext.first();
- }
- }
- mkt << "\n";
- mkt << "preprocess: $(PARSERS) compilers\n";
- mkt << "clean preprocess_clean: parser_clean compiler_clean\n\n";
- mkt << "parser_clean:\n";
- if(!project->isEmpty("YACCSOURCES") || !project->isEmpty("LEXSOURCES"))
- mkt << "\t-rm -f $(PARSERS)\n";
+ mkt << "preprocess: compilers\n";
+ mkt << "clean preprocess_clean: compiler_clean\n\n";
writeExtraTargets(mkt);
if(!project->isEmpty("QMAKE_EXTRA_COMPILERS")) {
mkt << "compilers:";