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 From e6d2e4e0d45b260ddf47d75ff1cb7dd5d4d0eeaf Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 20 Sep 2010 18:11:50 +0200 Subject: Doc: document QMAKE_PROJECT_NAME Also moved QMAKE_LN_SHLIB upwards to maintain alphabetical order. Task-number: QTBUG-3206 Reviewed-by: aep --- doc/src/development/qmake-manual.qdoc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index b6b48bc..d6dc7d6 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -2665,6 +2665,13 @@ value of this variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. + \section1 QMAKE_LN_SHLIB + + This variable contains the command to execute when creating a link + to a shared library. The + value of this variable is typically handled by \c qmake or + \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. + \section1 QMAKE_POST_LINK This variable contains the command to execute after linking the TARGET @@ -2679,12 +2686,13 @@ executed, additionally some backends will not support this - mostly only Makefile backends. - \section1 QMAKE_LN_SHLIB + \section1 QMAKE_PROJECT_NAME - This variable contains the command to execute when creating a link - to a shared library. The - value of this variable is typically handled by \c qmake or - \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. + \e {This is used for Visual Studio project files only.} + + This variable determines the name of the project when generating project + files for IDEs. The default value is the target name. The value of this + variable is typically handled by \c qmake and rarely needs to be modified. \section1 QMAKE_MAC_SDK -- cgit v0.12 From dbe7af4ad982186d26f6e3dbf5dad8e97b318443 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 21 Sep 2010 10:30:48 +0200 Subject: fix project name duplicates in generated projects.sln Using QMAKE_PROJECT_NAME to rename certain projects. Task-number: QTBUG-6887 Reviewed-by: owolff --- examples/draganddrop/puzzle/puzzle.pro | 2 ++ examples/graphicsview/flowlayout/flowlayout.pro | 6 ++---- examples/script/calculator/calculator.pro | 1 + examples/tools/echoplugin/echowindow/echowindow.pro | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/draganddrop/puzzle/puzzle.pro b/examples/draganddrop/puzzle/puzzle.pro index 31786c7..ec88f7a 100644 --- a/examples/draganddrop/puzzle/puzzle.pro +++ b/examples/draganddrop/puzzle/puzzle.pro @@ -7,6 +7,8 @@ SOURCES = main.cpp \ pieceslist.cpp \ puzzlewidget.cpp +QMAKE_PROJECT_NAME = dndpuzzle + # install target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/puzzle sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg diff --git a/examples/graphicsview/flowlayout/flowlayout.pro b/examples/graphicsview/flowlayout/flowlayout.pro index c029d6c..ce35367 100644 --- a/examples/graphicsview/flowlayout/flowlayout.pro +++ b/examples/graphicsview/flowlayout/flowlayout.pro @@ -1,12 +1,10 @@ -###################################################################### -# Automatically generated by qmake (2.01a) ma 30. mar 12:46:15 2009 -###################################################################### - TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . +QMAKE_PROJECT_NAME = flowlayout_graphicsview + # Input HEADERS += flowlayout.h window.h SOURCES += flowlayout.cpp main.cpp window.cpp diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro index 6385d7e..f328fc3 100644 --- a/examples/script/calculator/calculator.pro +++ b/examples/script/calculator/calculator.pro @@ -2,6 +2,7 @@ QT += script CONFIG += uitools RESOURCES += calculator.qrc SOURCES += main.cpp +QMAKE_PROJECT_NAME = scripted_calculator contains(QT_CONFIG, scripttools): QT += scripttools diff --git a/examples/tools/echoplugin/echowindow/echowindow.pro b/examples/tools/echoplugin/echowindow/echowindow.pro index bdf8c41..c2abc6a 100644 --- a/examples/tools/echoplugin/echowindow/echowindow.pro +++ b/examples/tools/echoplugin/echowindow/echowindow.pro @@ -4,6 +4,7 @@ SOURCES = echowindow.cpp \ main.cpp TARGET = echoplugin +QMAKE_PROJECT_NAME = echopluginwindow win32 { debug:DESTDIR = ../debug/ release:DESTDIR = ../release/ -- cgit v0.12