From dbe7af4ad982186d26f6e3dbf5dad8e97b318443 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
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