summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2019-09-21 23:42:49 +0300
committerOrgad Shaneh <orgads@gmail.com>2019-09-23 11:52:01 +0000
commit471e78a99ce3fca894467ff87d3ee357e9e8f7ce (patch)
tree2d77a95bed113dae2b4481cc1b2ed5fc95bae09d
parentb73a2fffe0793551e3c3d8306b4cf1c542d9d651 (diff)
downloadqt-creator-471e78a99ce3fca894467ff87d3ee357e9e8f7ce.tar.gz
Qmake: Update effective qmake call on project parsing finished
If the project has MAKEFILE = Makefile.$$VAR it wasn't reflected when VAR was set in Qmake arguments. Change-Id: Ieb1cbfee9a0def89a5c9b6259e8acc87751b0f3a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/plugins/qmakeprojectmanager/qmakestep.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index f8ca59f594..84b756012f 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -590,6 +590,8 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
this, &QMakeStepConfigWidget::linkQmlDebuggingLibraryChanged);
connect(step->project(), &Project::projectLanguagesUpdated,
this, &QMakeStepConfigWidget::linkQmlDebuggingLibraryChanged);
+ connect(step->project(), &Project::parsingFinished,
+ this, &QMakeStepConfigWidget::updateEffectiveQMakeCall);
connect(step, &QMakeStep::useQtQuickCompilerChanged,
this, &QMakeStepConfigWidget::useQtQuickCompilerChanged);
connect(step, &QMakeStep::separateDebugInfoChanged,