AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass a pointer instead of a reference to initFrom()

Browse Source 
msvc thinks that it's impossible to create a null reference (because
some language lawyer said so) and thus complains about our assert that
checks the reference's validity. work around by not dereferencing the
pointers we already have.

Change-Id: Ife2288d4187860105de12fdebc0e671e0159ace3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-06-16 14:31:30 +02:00
parent 473ed1c1aa
commit 11161bbfad
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qmake/library/qmakeevaluator.cpp
View File

@ -208,17 +208,17 @@ QMakeEvaluator::~QMakeEvaluator()
{
}
void QMakeEvaluator::initFrom(const QMakeEvaluator &other)
void QMakeEvaluator::initFrom(const QMakeEvaluator *other)
{
Q_ASSERT_X(&other, "QMakeEvaluator::visitProFile", "Project not prepared");
m_functionDefs = other.m_functionDefs;
m_valuemapStack = other.m_valuemapStack;
Q_ASSERT_X(other, "QMakeEvaluator::visitProFile", "Project not prepared");
m_functionDefs = other->m_functionDefs;
m_valuemapStack = other->m_valuemapStack;
m_valuemapInited = true;
m_qmakespec = other.m_qmakespec;
m_qmakespecName = other.m_qmakespecName;
m_mkspecPaths = other.m_mkspecPaths;
m_featureRoots = other.m_featureRoots;
m_dirSep = other.m_dirSep;
m_qmakespec = other->m_qmakespec;
m_qmakespecName = other->m_qmakespecName;
m_mkspecPaths = other->m_mkspecPaths;
m_featureRoots = other->m_featureRoots;
m_dirSep = other->m_dirSep;
}
//////// Evaluator tools /////////
@ -1355,7 +1355,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProFile(
return ReturnFalse;
#endif
initFrom(*baseEnv->evaluator);
initFrom(baseEnv->evaluator);
} else {
if (!m_valuemapInited)
loadDefaults();

2
qmake/library/qmakeevaluator.h
View File

@ -167,7 +167,7 @@ public:
bool prepareProject(const QString &inDir);
bool loadSpecInternal();
bool loadSpec();
void initFrom(const QMakeEvaluator &other);
void initFrom(const QMakeEvaluator *other);
void setupProject();
void evaluateCommand(const QString &cmds, const QString &where);
void applyExtraConfigs();

2
qmake/project.cpp
View File

@ -60,7 +60,7 @@ QMakeProject::QMakeProject()
QMakeProject::QMakeProject(QMakeProject *p)
: QMakeEvaluator(Option::globals, Option::parser, Option::vfs, &Option::evalHandler)
{
initFrom(*p);
initFrom(p);
}
bool QMakeProject::boolRet(VisitReturn vr)