diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-04-25 16:55:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 06:07:19 +0200 |
| commit | bad1384102f5d0dc6b7af2d37f9218cc232b1971 (patch) | |
| tree | 0705a8cf36c9b41b3f3cd4cd351b5a2e777ca3e9 /qmake/generators/win32/msvc_vcproj.h | |
| parent | e424354e85671928e6a1cf11cb5cf0a89ba9357f (diff) | |
Bring subproject dependencies in line with Makefile generators
When generating the solution file it should extract the
dependencies from the pro file as this will bring it in
line with the Makefile generators.
Task-number: QTBUG-22561
Change-Id: I8d5b6607712f2c77c87ef093480e64b9633817d8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.h')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index ce1f75d9de..201ccbb3a3 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -54,6 +54,7 @@ enum Target { }; class QUuid; +struct VcsolutionDepend; class VcprojGenerator : public Win32MakefileGenerator { bool init_flag; @@ -130,7 +131,14 @@ protected: QList<VcprojGenerator*> mergedProjects; private: - QStringList collectSubDirs(QMakeProject *proj); + ProStringList collectDependencies(QMakeProject *proj, QHash<QString, QString> &projLookup, + QHash<QString, QString> &projGuids, + QHash<VcsolutionDepend *, QStringList> &extraSubdirs, + QHash<QString, VcsolutionDepend*> &solution_depends, + QList<VcsolutionDepend*> &solution_cleanup, + QTextStream &t, + QHash<QString, ProStringList> &subdirProjectLookup, + const ProStringList &allDependencies = ProStringList()); QUuid increaseUUID(const QUuid &id); friend class VCFilter; }; |