diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-16 14:31:30 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-20 11:47:19 +0200 |
| commit | 11161bbfadd0056466fc414ed659d08a4a0fe492 (patch) | |
| tree | cdef2c516bcf1877413c9b36f473ad29a76cdc61 /qmake/library/qmakeevaluator.h | |
| parent | 473ed1c1aa67ceb345b20d13c408ed8bd65a9e41 (diff) | |
pass a pointer instead of a reference to initFrom()
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>
Diffstat (limited to 'qmake/library/qmakeevaluator.h')
| -rw-r--r-- | qmake/library/qmakeevaluator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/library/qmakeevaluator.h b/qmake/library/qmakeevaluator.h index de13033481..f322a48011 100644 --- a/qmake/library/qmakeevaluator.h +++ b/qmake/library/qmakeevaluator.h @@ -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(); |