From 9a9abf8a8a19faaf805c9ca4e09c9e2e3ae0c122 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 29 May 2013 15:04:06 +0200
Subject: [PATCH] Only process vcproj files if we do a -fully-process
A top-level vcproj (really a .sln file) only makes sense when sub-
projects are generated too, since the solutions generator will ignore
all non-generated projects.
Originally-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Change-Id: Iff09279d5760b5114a4cfb9b58ad677f2f69fa58
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
tools/configure/configureapp.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ad2854880a4..98b59ab6fdd 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1841,7 +1841,7 @@ bool Configure::displayHelp()
desc("BUILD_QMAKE", "no", "-no-qmake", "Do not compile qmake.");
desc("BUILD_QMAKE", "yes", "-qmake", "Compile qmake.\n");
- desc("PROCESS", "partial", "-process", "Generate top-level Makefiles/Project files.");
+ desc("PROCESS", "partial", "-process", "Generate only top-level Makefile.");
desc("PROCESS", "full", "-fully-process", "Generate Makefiles/Project files for the entire Qt\ntree.");
desc("PROCESS", "no", "-dont-process", "Do not generate Makefiles/Project files.\n");
@@ -3954,7 +3954,8 @@ void Configure::generateMakefiles()
{
QString dirName;
bool generate = true;
- bool doDsp = (dictionary["VCPROJFILES"] == "yes");
+ bool doDsp = (dictionary["VCPROJFILES"] == "yes"
+ && dictionary["PROCESS"] == "full");
while (generate) {
QString pwd = QDir::currentPath();
QString dirPath = buildPath + dirName;
--
GitLab