From 9e750d341ac7b03fa8f335065eb655d5e38b0d9d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 26 Sep 2012 19:05:33 +0200 Subject: [PATCH] fix conflicting Visual Studio project names for Qt examples Loading examples.sln resulted in a cascade of error messages because Visual Studio doesn't allow projects of the same name in a solution. Now using QMAKE_PROJECT_NAME to give the projects distinct names. Change-Id: Ifd3a00311253e4b234ece936092649ce0f0869d8 Reviewed-by: Thomas Hartmann --- examples/widgets/tutorials/addressbook-fr/part1/part1.pro | 2 ++ examples/widgets/tutorials/addressbook-fr/part2/part2.pro | 2 ++ examples/widgets/tutorials/addressbook-fr/part3/part3.pro | 2 ++ examples/widgets/tutorials/addressbook-fr/part4/part4.pro | 2 ++ examples/widgets/tutorials/addressbook-fr/part5/part5.pro | 2 ++ examples/widgets/tutorials/addressbook-fr/part6/part6.pro | 2 ++ examples/widgets/tutorials/addressbook-fr/part7/part7.pro | 2 ++ examples/widgets/tutorials/addressbook/part1/part1.pro | 2 ++ examples/widgets/tutorials/addressbook/part2/part2.pro | 2 ++ examples/widgets/tutorials/addressbook/part3/part3.pro | 2 ++ examples/widgets/tutorials/addressbook/part4/part4.pro | 2 ++ examples/widgets/tutorials/addressbook/part5/part5.pro | 2 ++ examples/widgets/tutorials/addressbook/part6/part6.pro | 2 ++ examples/widgets/tutorials/addressbook/part7/part7.pro | 2 ++ examples/widgets/widgets/analogclock/analogclock.pro | 2 ++ 15 files changed, 30 insertions(+) diff --git a/examples/widgets/tutorials/addressbook-fr/part1/part1.pro b/examples/widgets/tutorials/addressbook-fr/part1/part1.pro index f04c8ff10da..4f5067c3e01 100644 --- a/examples/widgets/tutorials/addressbook-fr/part1/part1.pro +++ b/examples/widgets/tutorials/addressbook-fr/part1/part1.pro @@ -2,6 +2,8 @@ SOURCES = addressbook.cpp \ main.cpp HEADERS = addressbook.h +QMAKE_PROJECT_NAME = abfr_part1 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro diff --git a/examples/widgets/tutorials/addressbook-fr/part2/part2.pro b/examples/widgets/tutorials/addressbook-fr/part2/part2.pro index 46f811676ab..b0a2bc21160 100644 --- a/examples/widgets/tutorials/addressbook-fr/part2/part2.pro +++ b/examples/widgets/tutorials/addressbook-fr/part2/part2.pro @@ -2,6 +2,8 @@ SOURCES = addressbook.cpp \ main.cpp HEADERS = addressbook.h +QMAKE_PROJECT_NAME = abfr_part2 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro diff --git a/examples/widgets/tutorials/addressbook-fr/part3/part3.pro b/examples/widgets/tutorials/addressbook-fr/part3/part3.pro index d76baaae5d0..c5d7656bfa6 100644 --- a/examples/widgets/tutorials/addressbook-fr/part3/part3.pro +++ b/examples/widgets/tutorials/addressbook-fr/part3/part3.pro @@ -2,6 +2,8 @@ SOURCES = addressbook.cpp \ main.cpp HEADERS = addressbook.h +QMAKE_PROJECT_NAME = abfr_part3 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro diff --git a/examples/widgets/tutorials/addressbook-fr/part4/part4.pro b/examples/widgets/tutorials/addressbook-fr/part4/part4.pro index 1684d5e5f4c..9730887a5df 100644 --- a/examples/widgets/tutorials/addressbook-fr/part4/part4.pro +++ b/examples/widgets/tutorials/addressbook-fr/part4/part4.pro @@ -2,6 +2,8 @@ SOURCES = addressbook.cpp \ main.cpp HEADERS = addressbook.h +QMAKE_PROJECT_NAME = abfr_part4 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro diff --git a/examples/widgets/tutorials/addressbook-fr/part5/part5.pro b/examples/widgets/tutorials/addressbook-fr/part5/part5.pro index 1978068cc70..e9b48872027 100644 --- a/examples/widgets/tutorials/addressbook-fr/part5/part5.pro +++ b/examples/widgets/tutorials/addressbook-fr/part5/part5.pro @@ -4,6 +4,8 @@ SOURCES = addressbook.cpp \ HEADERS = addressbook.h \ finddialog.h +QMAKE_PROJECT_NAME = abfr_part5 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro diff --git a/examples/widgets/tutorials/addressbook-fr/part6/part6.pro b/examples/widgets/tutorials/addressbook-fr/part6/part6.pro index b5ec9569a8b..a95df8d800c 100644 --- a/examples/widgets/tutorials/addressbook-fr/part6/part6.pro +++ b/examples/widgets/tutorials/addressbook-fr/part6/part6.pro @@ -4,6 +4,8 @@ SOURCES = addressbook.cpp \ HEADERS = addressbook.h \ finddialog.h +QMAKE_PROJECT_NAME = abfr_part6 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro diff --git a/examples/widgets/tutorials/addressbook-fr/part7/part7.pro b/examples/widgets/tutorials/addressbook-fr/part7/part7.pro index 0b8ba509693..a2cd00dc943 100644 --- a/examples/widgets/tutorials/addressbook-fr/part7/part7.pro +++ b/examples/widgets/tutorials/addressbook-fr/part7/part7.pro @@ -4,6 +4,8 @@ SOURCES = addressbook.cpp \ HEADERS = addressbook.h \ finddialog.h +QMAKE_PROJECT_NAME = abfr_part7 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro diff --git a/examples/widgets/tutorials/addressbook/part1/part1.pro b/examples/widgets/tutorials/addressbook/part1/part1.pro index 67f9f3db204..44b98982f99 100644 --- a/examples/widgets/tutorials/addressbook/part1/part1.pro +++ b/examples/widgets/tutorials/addressbook/part1/part1.pro @@ -2,6 +2,8 @@ SOURCES = addressbook.cpp \ main.cpp HEADERS = addressbook.h +QMAKE_PROJECT_NAME = ab_part1 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro diff --git a/examples/widgets/tutorials/addressbook/part2/part2.pro b/examples/widgets/tutorials/addressbook/part2/part2.pro index 26e2e270fae..69f7928de2a 100644 --- a/examples/widgets/tutorials/addressbook/part2/part2.pro +++ b/examples/widgets/tutorials/addressbook/part2/part2.pro @@ -2,6 +2,8 @@ SOURCES = addressbook.cpp \ main.cpp HEADERS = addressbook.h +QMAKE_PROJECT_NAME = ab_part2 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro diff --git a/examples/widgets/tutorials/addressbook/part3/part3.pro b/examples/widgets/tutorials/addressbook/part3/part3.pro index 5a5d78ed732..9d46632089b 100644 --- a/examples/widgets/tutorials/addressbook/part3/part3.pro +++ b/examples/widgets/tutorials/addressbook/part3/part3.pro @@ -2,6 +2,8 @@ SOURCES = addressbook.cpp \ main.cpp HEADERS = addressbook.h +QMAKE_PROJECT_NAME = ab_part3 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro diff --git a/examples/widgets/tutorials/addressbook/part4/part4.pro b/examples/widgets/tutorials/addressbook/part4/part4.pro index 5b3462c65a1..eab04eef093 100644 --- a/examples/widgets/tutorials/addressbook/part4/part4.pro +++ b/examples/widgets/tutorials/addressbook/part4/part4.pro @@ -2,6 +2,8 @@ SOURCES = addressbook.cpp \ main.cpp HEADERS = addressbook.h +QMAKE_PROJECT_NAME = ab_part4 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro diff --git a/examples/widgets/tutorials/addressbook/part5/part5.pro b/examples/widgets/tutorials/addressbook/part5/part5.pro index 84757b2455f..691e56b914e 100644 --- a/examples/widgets/tutorials/addressbook/part5/part5.pro +++ b/examples/widgets/tutorials/addressbook/part5/part5.pro @@ -4,6 +4,8 @@ SOURCES = addressbook.cpp \ HEADERS = addressbook.h \ finddialog.h +QMAKE_PROJECT_NAME = ab_part5 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro diff --git a/examples/widgets/tutorials/addressbook/part6/part6.pro b/examples/widgets/tutorials/addressbook/part6/part6.pro index c6be890e916..d218280467a 100644 --- a/examples/widgets/tutorials/addressbook/part6/part6.pro +++ b/examples/widgets/tutorials/addressbook/part6/part6.pro @@ -4,6 +4,8 @@ SOURCES = addressbook.cpp \ HEADERS = addressbook.h \ finddialog.h +QMAKE_PROJECT_NAME = ab_part6 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro diff --git a/examples/widgets/tutorials/addressbook/part7/part7.pro b/examples/widgets/tutorials/addressbook/part7/part7.pro index 9cee4c94db5..8120816441b 100644 --- a/examples/widgets/tutorials/addressbook/part7/part7.pro +++ b/examples/widgets/tutorials/addressbook/part7/part7.pro @@ -4,6 +4,8 @@ SOURCES = addressbook.cpp \ HEADERS = addressbook.h \ finddialog.h +QMAKE_PROJECT_NAME = ab_part7 + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro diff --git a/examples/widgets/widgets/analogclock/analogclock.pro b/examples/widgets/widgets/analogclock/analogclock.pro index a2641150e21..5ba3a6f6785 100644 --- a/examples/widgets/widgets/analogclock/analogclock.pro +++ b/examples/widgets/widgets/analogclock/analogclock.pro @@ -2,6 +2,8 @@ HEADERS = analogclock.h SOURCES = analogclock.cpp \ main.cpp +QMAKE_PROJECT_NAME = widgets_analogclock + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/analogclock sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS analogclock.pro