diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-08-14 15:58:47 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-08-14 16:12:14 +0200 |
| commit | cfcf54a97112a7f50de96bab8161fce5e0502a99 (patch) | |
| tree | 44b30a051b13559790a74faf6303ab56817bdf08 /src/lib/buildgraph/buildgraphloader.cpp | |
| parent | cf782699501eb022179b10bfce8176379f067805 (diff) | |
| download | qbs-cfcf54a97112a7f50de96bab8161fce5e0502a99.tar.gz | |
Fix build error with Qt 4.
QSharedPointer::reset() is new in Qt 5.
Change-Id: I6314aed42706b59b19fcc15f8d623f15cc942029
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph/buildgraphloader.cpp')
| -rw-r--r-- | src/lib/buildgraph/buildgraphloader.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/buildgraph/buildgraphloader.cpp b/src/lib/buildgraph/buildgraphloader.cpp index 4466d381e..38f852853 100644 --- a/src/lib/buildgraph/buildgraphloader.cpp +++ b/src/lib/buildgraph/buildgraphloader.cpp @@ -200,8 +200,10 @@ void BuildGraphLoader::trackProjectChanges(const SetupProjectParameters ¶met productsWithChangedFiles); QSharedPointer<ProjectBuildData> oldBuildData; - if (!changedProducts.isEmpty()) - oldBuildData.reset(new ProjectBuildData(restoredProject->buildData.data())); + if (!changedProducts.isEmpty()) { + oldBuildData = QSharedPointer<ProjectBuildData>( + new ProjectBuildData(restoredProject->buildData.data())); + } // For products with "serious" changes such as different prepare scripts, we set up the // build data from scratch to be on the safe side. This can be made more fine-grained |