1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only process vcproj files if we do a -fully-process

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2013-05-29 15:04:06 +02:00 committed by The Qt Project
parent 0a1b89bff5
commit 9a9abf8a8a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/configure/configureapp.cpp
View File

@ -1841,7 +1841,7 @@ bool Configure::displayHelp()
desc("BUILD_QMAKE", "no", "-no-qmake", "Do not compile qmake."); desc("BUILD_QMAKE", "no", "-no-qmake", "Do not compile qmake.");
desc("BUILD_QMAKE", "yes", "-qmake", "Compile qmake.\n"); 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", "full", "-fully-process", "Generate Makefiles/Project files for the entire Qt\ntree.");
desc("PROCESS", "no", "-dont-process", "Do not generate Makefiles/Project files.\n"); desc("PROCESS", "no", "-dont-process", "Do not generate Makefiles/Project files.\n");
@ -3954,7 +3954,8 @@ void Configure::generateMakefiles()
{ {
QString dirName; QString dirName;
bool generate = true; bool generate = true;
bool doDsp = (dictionary["VCPROJFILES"] == "yes"); bool doDsp = (dictionary["VCPROJFILES"] == "yes"
&& dictionary["PROCESS"] == "full");
while (generate) { while (generate) {
QString pwd = QDir::currentPath(); QString pwd = QDir::currentPath();
QString dirPath = buildPath + dirName; QString dirPath = buildPath + dirName;