From 6e393434ef1a341d252d6ae5a81edce1118850a9 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 16 Apr 2012 16:09:18 +0200 Subject: 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 (cherry picked from commit ac7dd2782f078e66c5240a07fff5a25cdf5ba61b) --- qmake/generators/win32/msvc_vcproj.cpp | 3 +++ 1 file changed, 3 insertions(+) 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 &vars = tmp_proj.variables(); -- cgit v0.12