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

remove now unused QMakeProject c'tors

Browse Source 
Change-Id: Ia65d49df50a5610bbd88417ca90ac348a774a1e1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-02-20 22:19:11 +01:00 committed by Qt by Nokia
parent dce3821b8a
commit a30074bab8
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qmake/project.cpp
View File

@ -614,10 +614,8 @@ QMakeProject::~QMakeProject()
void void
QMakeProject::init(QMakeProperty *p, const QHash<QString, QStringList> *vars) QMakeProject::init(QMakeProperty *p)
{ {
if(vars)
base_vars = *vars;
if(!p) { if(!p) {
prop = new QMakeProperty; prop = new QMakeProperty;
own_prop = true; own_prop = true;
@ -631,7 +629,8 @@ QMakeProject::init(QMakeProperty *p, const QHash<QString, QStringList> *vars)
QMakeProject::QMakeProject(QMakeProject *p, const QHash<QString, QStringList> *vars) QMakeProject::QMakeProject(QMakeProject *p, const QHash<QString, QStringList> *vars)
{ {
init(p->properties(), vars ? vars : &p->variables()); init(p->properties());
base_vars = vars ? *vars : p->variables();
for(QHash<QString, FunctionBlock*>::iterator it = p->replaceFunctions.begin(); it != p->replaceFunctions.end(); ++it) { for(QHash<QString, FunctionBlock*>::iterator it = p->replaceFunctions.begin(); it != p->replaceFunctions.end(); ++it) {
it.value()->ref(); it.value()->ref();
replaceFunctions.insert(it.key(), it.value()); replaceFunctions.insert(it.key(), it.value());

7
qmake/project.h
View File

@ -106,17 +106,14 @@ class QMakeProject
bool doProjectCheckReqs(const QStringList &deps, QHash<QString, QStringList> &place); bool doProjectCheckReqs(const QStringList &deps, QHash<QString, QStringList> &place);
bool doVariableReplace(QString &str, QHash<QString, QStringList> &place); bool doVariableReplace(QString &str, QHash<QString, QStringList> &place);
QStringList doVariableReplaceExpand(const QString &str, QHash<QString, QStringList> &place, bool *ok=0); QStringList doVariableReplaceExpand(const QString &str, QHash<QString, QStringList> &place, bool *ok=0);
void init(QMakeProperty *, const QHash<QString, QStringList> *); void init(QMakeProperty *);
QStringList &values(const QString &v, QHash<QString, QStringList> &place); QStringList &values(const QString &v, QHash<QString, QStringList> &place);
void validateModes(); void validateModes();
void resolveSpec(QString *spec, const QString &qmakespec); void resolveSpec(QString *spec, const QString &qmakespec);
public: public:
QMakeProject() { init(0, 0); } QMakeProject(QMakeProperty *p = 0) { init(p); }
QMakeProject(QMakeProperty *p) { init(p, 0); }
QMakeProject(QMakeProject *p, const QHash<QString, QStringList> *nvars=0); QMakeProject(QMakeProject *p, const QHash<QString, QStringList> *nvars=0);
QMakeProject(const QHash<QString, QStringList> &nvars) { init(0, &nvars); }
QMakeProject(QMakeProperty *p, const QHash<QString, QStringList> &nvars) { init(p, &nvars); }
~QMakeProject(); ~QMakeProject();
void setExtraVars(const QHash<QString, QStringList> &_vars) { extra_vars = _vars; } void setExtraVars(const QHash<QString, QStringList> &_vars) { extra_vars = _vars; }