Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  fix project name duplicates in generated projects.sln
  Doc: document QMAKE_PROJECT_NAME
  qmake: introduction of QMAKE_PROJECT_NAME

1 files 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