From 770c24812b6823d48bbea2f03942221d1aed964c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 15 Jun 2014 14:13:55 +0200
Subject: Use single template set of templates for .sln files

---
 qt/oracle/makefile               | 18 +++++++++---------
 qt/oracle/qt-oracle-qt4-vc10.sln | 15 ---------------
 qt/oracle/qt-oracle-qt4-vc11.sln | 15 ---------------
 qt/oracle/qt-oracle-qt4-vc12.sln | 17 -----------------
 qt/oracle/qt-oracle-qt4-vc8.sln  | 15 ---------------
 qt/oracle/qt-oracle-qt4-vc9.sln  | 15 ---------------
 qt/oracle/qt-oracle-qt5-vc10.sln | 15 ---------------
 qt/oracle/qt-oracle-qt5-vc11.sln | 15 ---------------
 qt/oracle/qt-oracle-qt5-vc12.sln | 17 -----------------
 qt/oracle/qt-oracle-qt5-vc9.sln  | 15 ---------------
 10 files changed, 9 insertions(+), 148 deletions(-)
 delete mode 100644 qt/oracle/qt-oracle-qt4-vc10.sln
 delete mode 100644 qt/oracle/qt-oracle-qt4-vc11.sln
 delete mode 100644 qt/oracle/qt-oracle-qt4-vc12.sln
 delete mode 100644 qt/oracle/qt-oracle-qt4-vc8.sln
 delete mode 100644 qt/oracle/qt-oracle-qt4-vc9.sln
 delete mode 100644 qt/oracle/qt-oracle-qt5-vc10.sln
 delete mode 100644 qt/oracle/qt-oracle-qt5-vc11.sln
 delete mode 100644 qt/oracle/qt-oracle-qt5-vc12.sln
 delete mode 100644 qt/oracle/qt-oracle-qt5-vc9.sln

(limited to 'qt/oracle')

diff --git a/qt/oracle/makefile b/qt/oracle/makefile
index ae09691..a47dd24 100644
--- a/qt/oracle/makefile
+++ b/qt/oracle/makefile
@@ -21,15 +21,15 @@ $(name)-qt4-vc11.sln $(name)-qt5-vc11.sln \
 $(name)-qt4-vc12.sln $(name)-qt5-vc12.sln
 $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests)))
 	$(call meta-automake)
-	$(call meta-vc8sln,$(name)-qt4-vc8.sln,,-qt4-vc8.vcproj)
-	$(call meta-vc9sln,$(name)-qt4-vc9.sln,,-qt4-vc9.vcproj)
-	$(call meta-vc9sln,$(name)-qt5-vc9.sln,,-qt5-vc9.vcproj)
-	$(call meta-vc10sln,$(name)-qt4-vc10.sln,,-qt4-vc10.vcxproj)
-	$(call meta-vc10sln,$(name)-qt5-vc10.sln,,-qt5-vc10.vcxproj)
-	$(call meta-vc11sln,$(name)-qt4-vc11.sln,,-qt4-vc11.vcxproj)
-	$(call meta-vc11sln,$(name)-qt5-vc11.sln,,-qt5-vc11.vcxproj)
-	$(call meta-vc12sln,$(name)-qt4-vc12.sln,,-qt4-vc12.vcxproj)
-	$(call meta-vc12sln,$(name)-qt5-vc12.sln,,-qt5-vc12.vcxproj)
+	$(call meta-vc8sln1,$(name)-qt4,-qt4)
+	$(call meta-vc9sln1,$(name)-qt4,-qt4)
+	$(call meta-vc9sln1,$(name)-qt5,-qt5)
+	$(call meta-vc10sln1,$(name)-qt4,-qt4)
+	$(call meta-vc10sln1,$(name)-qt5,-qt5)
+	$(call meta-vc11sln1,$(name)-qt4,-qt4)
+	$(call meta-vc11sln1,$(name)-qt5,-qt5)
+	$(call meta-vc12sln1,$(name)-qt4,-qt4)
+	$(call meta-vc12sln1,$(name)-qt5,-qt5)
         # Can't have Qt-version specific tests.
 	$(call meta-vctest,$(name)-qt4-vc10.sln,test.bat)
 
diff --git a/qt/oracle/qt-oracle-qt4-vc10.sln b/qt/oracle/qt-oracle-qt4-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/oracle/qt-oracle-qt4-vc10.sln
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-__projects__
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-__solution_configurations__
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-__project_configurations__
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/qt/oracle/qt-oracle-qt4-vc11.sln b/qt/oracle/qt-oracle-qt4-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/oracle/qt-oracle-qt4-vc11.sln
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-__projects__
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-__solution_configurations__
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-__project_configurations__
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/qt/oracle/qt-oracle-qt4-vc12.sln b/qt/oracle/qt-oracle-qt4-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/oracle/qt-oracle-qt4-vc12.sln
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-__projects__
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-__solution_configurations__
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-__project_configurations__
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/qt/oracle/qt-oracle-qt4-vc8.sln b/qt/oracle/qt-oracle-qt4-vc8.sln
deleted file mode 100644
index f38bad2..0000000
--- a/qt/oracle/qt-oracle-qt4-vc8.sln
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-__projects__
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-__solution_configurations__
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-__project_configurations__
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/qt/oracle/qt-oracle-qt4-vc9.sln b/qt/oracle/qt-oracle-qt4-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/oracle/qt-oracle-qt4-vc9.sln
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-__projects__
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-__solution_configurations__
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-__project_configurations__
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/qt/oracle/qt-oracle-qt5-vc10.sln b/qt/oracle/qt-oracle-qt5-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/oracle/qt-oracle-qt5-vc10.sln
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-__projects__
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-__solution_configurations__
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-__project_configurations__
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/qt/oracle/qt-oracle-qt5-vc11.sln b/qt/oracle/qt-oracle-qt5-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/oracle/qt-oracle-qt5-vc11.sln
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-__projects__
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-__solution_configurations__
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-__project_configurations__
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/qt/oracle/qt-oracle-qt5-vc12.sln b/qt/oracle/qt-oracle-qt5-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/oracle/qt-oracle-qt5-vc12.sln
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-__projects__
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-__solution_configurations__
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-__project_configurations__
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/qt/oracle/qt-oracle-qt5-vc9.sln b/qt/oracle/qt-oracle-qt5-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/oracle/qt-oracle-qt5-vc9.sln
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-__projects__
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-__solution_configurations__
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-__project_configurations__
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
-- 
cgit v1.1