diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2017-09-14 12:18:52 +0200 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2017-09-14 10:49:42 +0000 |
| commit | e4c56d0753e88a0b5ce0c576fb4856c4b82225c3 (patch) | |
| tree | e2ec491063bdea8e8a4e5f9accca2ac8d6466484 | |
| parent | b06e10e85d1e76a82b5eac2115525496a63c2e43 (diff) | |
Fix creating bad project if "flat" flag is removed
During .pro file import, RefreshRccSteps() now looks into subfilters
for rcc outputs to remove instead of just the top-level filter. In the
case where qmake generated a project structure with rcc outputs in the
"Generated Files/debug" and "Generated Files/release" filters (which is
the case with CONFIG -= flat), RefreshRccSteps() did not correctly
handle these outputs as it only looked for them in the topmost
"Generated Files" filter.
Task-number: QTVSADDINBUG-439
Change-Id: I2b71f0a511b2dd487f01f08fbc201e5f5006f72c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/qtprojectlib/QtProject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qtprojectlib/QtProject.cs b/src/qtprojectlib/QtProject.cs index 9fd860d0..fe345379 100644 --- a/src/qtprojectlib/QtProject.cs +++ b/src/qtprojectlib/QtProject.cs @@ -1043,7 +1043,7 @@ namespace QtProjectLib var vcFilter = FindFilterFromGuid(Filters.GeneratedFiles().UniqueIdentifier); if (vcFilter != null) { - var filterFiles = (IVCCollection) vcFilter.Files; + var filterFiles = GetAllFilesFromFilter(vcFilter); var filesToDelete = new List<VCFile>(); foreach (VCFile rmFile in filterFiles) { if (rmFile.Name.StartsWith("qrc_", StringComparison.OrdinalIgnoreCase)) |