From 9e59a5256eb6275483bc3777878a62c2069a0927 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 20 Sep 2010 17:48:45 +0200 Subject: qmake: introduction of QMAKE_PROJECT_NAME With this variable one can set the project name for IDE project files. Currently only used for Visual Studio Task-number: QTBUG-3206 Reviewed-by: ossi --- qmake/generators/win32/msvc_vcproj.cpp | 6 +++--- qmake/generators/win32/winmakefile.cpp | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index f32ba7e..3c42f14 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -280,7 +280,7 @@ bool VcprojGenerator::writeProjectMakefile() mergedProjects.at(0)->vcProject.Name == mergedProjects.at(1)->vcProject.Name) mergedProjects.at(0)->writePrlFile(); - mergedProject.Name = unescapeFilePath(project->first("QMAKE_ORIG_TARGET")); + mergedProject.Name = project->first("QMAKE_PROJECT_NAME"); mergedProject.Version = mergedProjects.at(0)->vcProject.Version; mergedProject.ProjectGUID = project->isEmpty("QMAKE_UUID") ? getProjectUUID().toString().toUpper() : project->first("QMAKE_UUID"); mergedProject.Keyword = project->first("VCPROJ_KEYWORD"); @@ -468,8 +468,8 @@ void VcprojGenerator::writeSubDirs(QTextStream &t) } } - // We assume project filename is [QMAKE_ORIG_TARGET].vcproj - QString vcproj = unescapeFilePath(tmp_vcproj.project->first("QMAKE_ORIG_TARGET") + project->first("VCPROJ_EXTENSION")); + // We assume project filename is [QMAKE_PROJECT_NAME].vcproj + QString vcproj = unescapeFilePath(tmp_vcproj.project->first("QMAKE_PROJECT_NAME") + project->first("VCPROJ_EXTENSION")); QString vcprojDir = qmake_getpwd(); // If file doesn't exsist, then maybe the users configuration diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index ecb20c7..58f21cb 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -290,6 +290,11 @@ void Win32MakefileGenerator::processVars() } project->values("QMAKE_ORIG_TARGET") = project->values("TARGET"); + if (project->isEmpty("QMAKE_PROJECT_NAME")) + project->values("QMAKE_PROJECT_NAME") = project->values("QMAKE_ORIG_TARGET"); + else if (project->first("TEMPLATE").startsWith("vc")) + project->values("MAKEFILE") = project->values("QMAKE_PROJECT_NAME"); + if (!project->values("QMAKE_INCDIR").isEmpty()) project->values("INCLUDEPATH") += project->values("QMAKE_INCDIR"); -- cgit v0.12