diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-04-28 18:12:08 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-04-28 18:12:08 +0200 |
commit | 243964aae9496922e400f84bd7a1a3ed3f674e96 (patch) | |
tree | 51b6cb30816058450d12217a34ebeda732b27a84 /src/lib/corelib/api | |
parent | 1dab72cfbf45ec6a47697d92fcad9f1b77a3e205 (diff) | |
parent | c1e1176332ccddc01e86aa07a458710053c1e9fa (diff) |
Merge remote-tracking branch 'origin/1.2'
Conflicts:
qbs_version.pri
share/qbs/modules/cpp/msvc.js
version.js
Change-Id: Id00deaf66737efd0e35230e2bddd41de1a6de60d
Diffstat (limited to 'src/lib/corelib/api')
-rw-r--r-- | src/lib/corelib/api/project.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp index c6eec80e0..dce270ef1 100644 --- a/src/lib/corelib/api/project.cpp +++ b/src/lib/corelib/api/project.cpp @@ -609,7 +609,7 @@ void ProjectPrivate::retrieveProjectData(ProjectData &projectData, product.d->groups << createGroupDataFromGroup(resolvedGroup); if (resolvedProduct->enabled) { QBS_CHECK(resolvedProduct->buildData); - foreach (const Artifact * const a, resolvedProduct->buildData->targetArtifacts()) { + foreach (const Artifact * const a, resolvedProduct->targetArtifacts()) { TargetArtifact ta; ta.d->filePath = a->filePath(); ta.d->fileTags = a->fileTags.toStringList(); |