diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-07 18:53:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 21:03:21 +0200 |
| commit | 58de01b54bf34c5ee416c1d6fe5e5d1c5bc89e5f (patch) | |
| tree | 53d66ef834385bd87b1f9a67b9371d9651c60172 /qmake | |
| parent | 4723f3fd04edf1aad6750ca91fd4648216d8b408 (diff) | |
fix setting of output directory of SUBDIRS with -tp vs
amends ec145129c.
Investigated-by: Nikolai Tasev
Task-number: QTBUG-32375
Change-Id: Iff27c03c0bb4f739dad9d10bae9576946948041b
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 86d31b01dc..a30129fa27 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -449,7 +449,7 @@ ProStringList VcprojGenerator::collectDependencies(QMakeProject *proj, QHash<QSt if (!qmake_setpwd(dir)) fprintf(stderr, "Cannot find directory: %s", dir.toLatin1().constData()); } - Option::output_dir = Option::globals->shadowedPath(QDir::cleanPath(fi.absoluteFilePath())); + Option::output_dir = Option::globals->shadowedPath(QDir::cleanPath(dir)); if (tmp_proj.read(fn)) { // Check if all requirements are fulfilled if (!tmp_proj.isEmpty("QMAKE_FAILED_REQUIREMENTS")) { |