summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-02-20 22:19:11 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-02 21:33:08 +0100
commita30074bab8446640d41060637b99394136bea7d7 (patch)
treea52d496e73e5f3bcf750ceed9ecd4572fbec7412 /qmake/project.cpp
parentdce3821b8a6dfbb041d7ecec8b97c960b0e08c51 (diff)
remove now unused QMakeProject c'tors
Change-Id: Ia65d49df50a5610bbd88417ca90ac348a774a1e1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r--qmake/project.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 208d5b7d3e..7a5c953f02 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -614,10 +614,8 @@ QMakeProject::~QMakeProject()
void
-QMakeProject::init(QMakeProperty *p, const QHash<QString, QStringList> *vars)
+QMakeProject::init(QMakeProperty *p)
{
- if(vars)
- base_vars = *vars;
if(!p) {
prop = new QMakeProperty;
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)
{
- 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) {
it.value()->ref();
replaceFunctions.insert(it.key(), it.value());