diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-16 14:09:18 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 18:12:09 (GMT) |
| commit | 6e393434ef1a341d252d6ae5a81edce1118850a9 (patch) | |
| tree | c056e61e70174232001347fe33246d10059bb09b /qmake/generators | |
| parent | a8b15f5bf3baabcfce6be028ccdfb0a320346989 (diff) | |
| download | Qt-6e393434ef1a341d252d6ae5a81edce1118850a9.zip Qt-6e393434ef1a341d252d6ae5a81edce1118850a9.tar.gz Qt-6e393434ef1a341d252d6ae5a81edce1118850a9.tar.bz2 | |
qmake vc(x)proj generator: don't create bogus directories
When creating the temporary project object,
Option::output_dir must be adjusted temporarily.
Task-number: QTBUG-22788
Change-Id: Ibf8897a46b63f48b9e33d7e2168b09e559cecec7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit ac7dd2782f078e66c5240a07fff5a25cdf5ba61b)
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 6bd4c70..29fcbda 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -457,10 +457,13 @@ void VcprojGenerator::writeSubDirs(QTextStream &t) // and to be able to extract all the dependencies Option::QMAKE_MODE old_mode = Option::qmake_mode; Option::qmake_mode = Option::QMAKE_GENERATE_NOTHING; + QString old_output_dir = Option::output_dir; + Option::output_dir = QFileInfo(fileFixify(dir, qmake_getpwd(), Option::output_dir)).canonicalFilePath(); VcprojGenerator tmp_vcproj; tmp_vcproj.setNoIO(true); tmp_vcproj.setProjectFile(&tmp_proj); Option::qmake_mode = old_mode; + Option::output_dir = old_output_dir; if(Option::debug_level) { debug_msg(1, "Dumping all variables:"); QMap<QString, QStringList> &vars = tmp_proj.variables(); |