diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-06-18 12:08:29 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-06-19 08:07:08 +0000 |
| commit | b57553b7a21d6cc4ee28779a7c81f5545708d3cb (patch) | |
| tree | 9e1c6f6191773b6a3a1579eeadf2bbed5704d91a /src | |
| parent | ea86ff5eb0aa63d61729366184c00d9612dcfa97 (diff) | |
QmakePM: Fix redundant execution of qmake on build file
... when Makefile is customized.
The resolved makefile was <directory>Makefile.custom instead of
<directory>/Makefile.custom.
Change-Id: I01c4ef8b6d4ba64fc6663219c2eab7a39e03888b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakestep.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 99dab8044d..54c8d0989d 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -225,19 +225,18 @@ bool QMakeStep::init(QList<const BuildStep *> &earlierSteps) m_makeArguments.clear(); } - QString makefile = workingDirectory; + QString makefile = workingDirectory + '/'; if (qmakeBc->subNodeBuild()) { QmakeProFile *pro = qmakeBc->subNodeBuild()->proFile(); if (pro && !pro->makefile().isEmpty()) makefile.append(pro->makefile()); else - makefile.append(QLatin1String("/Makefile")); + makefile.append("Makefile"); } else if (!qmakeBc->makefile().isEmpty()) { - makefile.append(QLatin1Char('/')); makefile.append(qmakeBc->makefile()); } else { - makefile.append(QLatin1String("/Makefile")); + makefile.append("Makefile"); } // Check whether we need to run qmake |