diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2019-01-08 14:12:02 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2019-01-08 15:50:51 +0000 |
| commit | 95ff8ee1dfd7fafb2d574d2da973dd899cdf9e21 (patch) | |
| tree | eb12603f1af171b988f00797afdee4d292a9b1ba | |
| parent | 5dec438f80ee90ae0b50cb210685fb27fb1960bf (diff) | |
Fix custom build step running after Qt tools
Any custom build item in the project will now be processed before the Qt
tools are invoked. The recent reworking of Qt/MSBuild introduced a
regression, whereby custom build items would be processed at the end of
compilation. This was causing build errors/warnings, e.g. with projects
imported from .pro files that include the generation of moc_predefs.h.
Task-number: QTVSADDINBUG-592
Change-Id: Ic24977de1ed6d12bdcecde4f12316911526e953e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/qtmsbuild/qt_globals.targets | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qtmsbuild/qt_globals.targets b/src/qtmsbuild/qt_globals.targets index 45850b64..e732437d 100644 --- a/src/qtmsbuild/qt_globals.targets +++ b/src/qtmsbuild/qt_globals.targets @@ -87,7 +87,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// // Prepare Qt build: read and parse work log file // --> - <Target Name="QtPrepare" AfterTargets="CustomBuild"> + <Target Name="QtPrepare"> <Message Importance="High" Condition="'$(QtDebug)' == 'true'" Text="#### QtPrepare"/> @@ -202,6 +202,7 @@ // --> <Target Name="QtWork" DependsOnTargets="QtVersion;QtPrepare;$(QtBuildTargets);QtWorkPrepare" + AfterTargets="CustomBuild" BeforeTargets="ClCompile"> <Message Importance="High" Condition="'$(QtDebug)' == 'true'" @@ -343,6 +344,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// // Root Qt target // --> - <Target Name="Qt" DependsOnTargets="QtWork;ClCompile"/> + <Target Name="Qt" DependsOnTargets="CustomBuild;QtWork;ClCompile"/> </Project> |