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

remove pointless 'group' parameter

Browse Source 
the c'tor always determines the group itself anyway.

Change-Id: Ia8f1e747aaefdab164beae34851aa99cec9b790a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-06-26 16:29:23 +02:00
parent 67665e7763
commit 1c23e51dbd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,7 +418,7 @@ class ProjectBuilderSources
bool buildable, object_output; bool buildable, object_output;
QString key, group, compiler; QString key, group, compiler;
public: public:
ProjectBuilderSources(const QString &key, bool buildable=false, const QString &group=QString(), const QString &compiler=QString(), bool producesObject=false); ProjectBuilderSources(const QString &key, bool buildable = false, const QString &compiler = QString(), bool producesObject = false);
QStringList files(QMakeProject *project) const; QStringList files(QMakeProject *project) const;
inline bool isBuildable() const { return buildable; } inline bool isBuildable() const { return buildable; }
inline QString keyName() const { return key; } inline QString keyName() const { return key; }
@ -442,8 +442,8 @@ public:
} }
}; };
ProjectBuilderSources::ProjectBuilderSources(const QString &k, bool b, ProjectBuilderSources::ProjectBuilderSources(const QString &k, bool b, const QString &c, bool o) :
const QString &g, const QString &c, bool o) : buildable(b), object_output(o), key(k), group(g), compiler(c) buildable(b), object_output(o), key(k), compiler(c)
{ {
// Override group name for a few common keys // Override group name for a few common keys
if (k == "SOURCES" || k == "OBJECTIVE_SOURCES" || k == "HEADERS") if (k == "SOURCES" || k == "OBJECTIVE_SOURCES" || k == "HEADERS")
@ -606,7 +606,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
} }
} }
sources.append(ProjectBuilderSources(inputs.at(input).toQString(), true, sources.append(ProjectBuilderSources(inputs.at(input).toQString(), true,
QString(), (*it).toQString(), isObj)); (*it).toQString(), isObj));
if (isObj) { if (isObj) {
inputs.removeAt(input); inputs.removeAt(input);