diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-07-02 12:05:48 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-03 21:36:26 +0200 |
commit | ffef22cae224fd6c575e64a73e5017e5855c9aff (patch) | |
tree | df2c7c99980b577372b7854ef1efd00e28b62600 /qmake/generators/mac | |
parent | 0233e9ec8bc1d65fbbd6be6fa798531a658b9ae2 (diff) |
Xcode: Fix defines in OTHER_C/CPLUSPLUSFLAGS for project file output
We were only fixing QMAKE_C/CXXFLAGS, not the defines we then appended.
Change-Id: Iaa4a394738658c45aae83941ebe54470d6d8e250
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/mac')
-rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 15 | ||||
-rw-r--r-- | qmake/generators/mac/pbuilder_pbx.h | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index c20a8f7a34..f0e139b137 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1382,24 +1382,24 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) !project->values("QMAKE_FRAMEWORKPATH").isEmpty() ? SettingsAsList : 0, 5) << ";" << "\n"; { - ProStringList cflags = fixListForOutput("QMAKE_CFLAGS"); + ProStringList cflags = project->values("QMAKE_CFLAGS"); const ProStringList &prl_defines = project->values("PRL_EXPORT_DEFINES"); for (int i = 0; i < prl_defines.size(); ++i) cflags += "-D" + prl_defines.at(i); const ProStringList &defines = project->values("DEFINES"); for (int i = 0; i < defines.size(); ++i) cflags += "-D" + defines.at(i); - t << "\t\t\t\t" << writeSettings("OTHER_CFLAGS", cflags, SettingsAsList, 5) << ";" << "\n"; + t << "\t\t\t\t" << writeSettings("OTHER_CFLAGS", fixListForOutput(cflags), SettingsAsList, 5) << ";" << "\n"; } { - ProStringList cxxflags = fixListForOutput("QMAKE_CXXFLAGS"); + ProStringList cxxflags = project->values("QMAKE_CXXFLAGS"); const ProStringList &prl_defines = project->values("PRL_EXPORT_DEFINES"); for (int i = 0; i < prl_defines.size(); ++i) cxxflags += "-D" + prl_defines.at(i); const ProStringList &defines = project->values("DEFINES"); for (int i = 0; i < defines.size(); ++i) cxxflags += "-D" + defines.at(i); - t << "\t\t\t\t" << writeSettings("OTHER_CPLUSPLUSFLAGS", cxxflags, SettingsAsList, 5) << ";" << "\n"; + t << "\t\t\t\t" << writeSettings("OTHER_CPLUSPLUSFLAGS", fixListForOutput(cxxflags), SettingsAsList, 5) << ";" << "\n"; } if (!project->isActiveConfig("staticlib")) { t << "\t\t\t\t" << writeSettings("OTHER_LDFLAGS", @@ -1527,8 +1527,13 @@ ProjectBuilderMakefileGenerator::fixForOutput(const QString &values) ProStringList ProjectBuilderMakefileGenerator::fixListForOutput(const char *where) { + return fixListForOutput(project->values(where)); +} + +ProStringList +ProjectBuilderMakefileGenerator::fixListForOutput(const ProStringList &l) +{ ProStringList ret; - const ProStringList &l = project->values(where); for(int i = 0; i < l.count(); i++) ret += fixForOutput(l[i].toQString()); return ret; diff --git a/qmake/generators/mac/pbuilder_pbx.h b/qmake/generators/mac/pbuilder_pbx.h index 255dd43348..a08dc7c2bd 100644 --- a/qmake/generators/mac/pbuilder_pbx.h +++ b/qmake/generators/mac/pbuilder_pbx.h @@ -61,6 +61,7 @@ class ProjectBuilderMakefileGenerator : public UnixMakefileGenerator QString findProgram(const ProString &prog); QString fixForOutput(const QString &file); ProStringList fixListForOutput(const char *where); + ProStringList fixListForOutput(const ProStringList &list); int reftypeForFile(const QString &where); QString sourceTreeForFile(const QString &where); QString projectSuffix() const; |