Use single template set of templates for .sln files

59 files changed, 45 insertions, 879 deletions

diff --git a/qt/common/qt-common-qt4-vc10.sln b/qt/common/qt-common-qt4-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/common/qt-common-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/common/qt-common-qt4-vc11.sln b/qt/common/qt-common-qt4-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/common/qt-common-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/common/qt-common-qt4-vc12.sln b/qt/common/qt-common-qt4-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/common/qt-common-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/common/qt-common-qt4-vc8.sln b/qt/common/qt-common-qt4-vc8.sln
deleted file mode 100644
index f38bad2..0000000
--- a/qt/common/qt-common-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/common/qt-common-qt4-vc9.sln b/qt/common/qt-common-qt4-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/common/qt-common-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/common/qt-common-qt5-vc10.sln b/qt/common/qt-common-qt5-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/common/qt-common-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/common/qt-common-qt5-vc11.sln b/qt/common/qt-common-qt5-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/common/qt-common-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/common/qt-common-qt5-vc12.sln b/qt/common/qt-common-qt5-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/common/qt-common-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/common/qt-common-qt5-vc9.sln b/qt/common/qt-common-qt5-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/common/qt-common-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
diff --git a/qt/mssql/makefile b/qt/mssql/makefile
index 282a581..6dd4c3e 100644
--- a/qt/mssql/makefile
+++ b/qt/mssql/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/mssql/qt-mssql-qt4-vc10.sln b/qt/mssql/qt-mssql-qt4-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/mssql/qt-mssql-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/mssql/qt-mssql-qt4-vc11.sln b/qt/mssql/qt-mssql-qt4-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/mssql/qt-mssql-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/mssql/qt-mssql-qt4-vc12.sln b/qt/mssql/qt-mssql-qt4-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/mssql/qt-mssql-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/mssql/qt-mssql-qt4-vc8.sln b/qt/mssql/qt-mssql-qt4-vc8.sln
deleted file mode 100644
index f38bad2..0000000
--- a/qt/mssql/qt-mssql-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/mssql/qt-mssql-qt4-vc9.sln b/qt/mssql/qt-mssql-qt4-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/mssql/qt-mssql-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/mssql/qt-mssql-qt5-vc10.sln b/qt/mssql/qt-mssql-qt5-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/mssql/qt-mssql-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/mssql/qt-mssql-qt5-vc11.sln b/qt/mssql/qt-mssql-qt5-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/mssql/qt-mssql-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/mssql/qt-mssql-qt5-vc12.sln b/qt/mssql/qt-mssql-qt5-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/mssql/qt-mssql-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/mssql/qt-mssql-qt5-vc9.sln b/qt/mssql/qt-mssql-qt5-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/mssql/qt-mssql-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
diff --git a/qt/mysql/makefile b/qt/mysql/makefile
index 0f5150f..8607012 100644
--- a/qt/mysql/makefile
+++ b/qt/mysql/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/mysql/qt-mysql-qt4-vc10.sln b/qt/mysql/qt-mysql-qt4-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/mysql/qt-mysql-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/mysql/qt-mysql-qt4-vc11.sln b/qt/mysql/qt-mysql-qt4-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/mysql/qt-mysql-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/mysql/qt-mysql-qt4-vc12.sln b/qt/mysql/qt-mysql-qt4-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/mysql/qt-mysql-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/mysql/qt-mysql-qt4-vc8.sln b/qt/mysql/qt-mysql-qt4-vc8.sln
deleted file mode 100644
index f38bad2..0000000
--- a/qt/mysql/qt-mysql-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/mysql/qt-mysql-qt4-vc9.sln b/qt/mysql/qt-mysql-qt4-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/mysql/qt-mysql-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/mysql/qt-mysql-qt5-vc10.sln b/qt/mysql/qt-mysql-qt5-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/mysql/qt-mysql-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/mysql/qt-mysql-qt5-vc11.sln b/qt/mysql/qt-mysql-qt5-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/mysql/qt-mysql-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/mysql/qt-mysql-qt5-vc12.sln b/qt/mysql/qt-mysql-qt5-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/mysql/qt-mysql-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/mysql/qt-mysql-qt5-vc9.sln b/qt/mysql/qt-mysql-qt5-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/mysql/qt-mysql-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
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
diff --git a/qt/pgsql/makefile b/qt/pgsql/makefile
index 7fbb23d..e4402f7 100644
--- a/qt/pgsql/makefile
+++ b/qt/pgsql/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/pgsql/qt-pgsql-qt4-vc10.sln b/qt/pgsql/qt-pgsql-qt4-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/pgsql/qt-pgsql-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/pgsql/qt-pgsql-qt4-vc11.sln b/qt/pgsql/qt-pgsql-qt4-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/pgsql/qt-pgsql-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/pgsql/qt-pgsql-qt4-vc12.sln b/qt/pgsql/qt-pgsql-qt4-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/pgsql/qt-pgsql-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/pgsql/qt-pgsql-qt4-vc8.sln b/qt/pgsql/qt-pgsql-qt4-vc8.sln
deleted file mode 100644
index f38bad2..0000000
--- a/qt/pgsql/qt-pgsql-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/pgsql/qt-pgsql-qt4-vc9.sln b/qt/pgsql/qt-pgsql-qt4-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/pgsql/qt-pgsql-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/pgsql/qt-pgsql-qt5-vc10.sln b/qt/pgsql/qt-pgsql-qt5-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/pgsql/qt-pgsql-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/pgsql/qt-pgsql-qt5-vc11.sln b/qt/pgsql/qt-pgsql-qt5-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/pgsql/qt-pgsql-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/pgsql/qt-pgsql-qt5-vc12.sln b/qt/pgsql/qt-pgsql-qt5-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/pgsql/qt-pgsql-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/pgsql/qt-pgsql-qt5-vc9.sln b/qt/pgsql/qt-pgsql-qt5-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/pgsql/qt-pgsql-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
diff --git a/qt/sqlite/makefile b/qt/sqlite/makefile
index 91c01ca..45f8fee 100644
--- a/qt/sqlite/makefile
+++ b/qt/sqlite/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/sqlite/qt-sqlite-qt4-vc10.sln b/qt/sqlite/qt-sqlite-qt4-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/sqlite/qt-sqlite-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/sqlite/qt-sqlite-qt4-vc11.sln b/qt/sqlite/qt-sqlite-qt4-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/sqlite/qt-sqlite-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/sqlite/qt-sqlite-qt4-vc12.sln b/qt/sqlite/qt-sqlite-qt4-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/sqlite/qt-sqlite-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/sqlite/qt-sqlite-qt4-vc8.sln b/qt/sqlite/qt-sqlite-qt4-vc8.sln
deleted file mode 100644
index f38bad2..0000000
--- a/qt/sqlite/qt-sqlite-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/sqlite/qt-sqlite-qt4-vc9.sln b/qt/sqlite/qt-sqlite-qt4-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/sqlite/qt-sqlite-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/sqlite/qt-sqlite-qt5-vc10.sln b/qt/sqlite/qt-sqlite-qt5-vc10.sln
deleted file mode 100644
index 9a5dc32..0000000
--- a/qt/sqlite/qt-sqlite-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/sqlite/qt-sqlite-qt5-vc11.sln b/qt/sqlite/qt-sqlite-qt5-vc11.sln
deleted file mode 100644
index 436eeea..0000000
--- a/qt/sqlite/qt-sqlite-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/sqlite/qt-sqlite-qt5-vc12.sln b/qt/sqlite/qt-sqlite-qt5-vc12.sln
deleted file mode 100644
index 446d701..0000000
--- a/qt/sqlite/qt-sqlite-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/sqlite/qt-sqlite-qt5-vc9.sln b/qt/sqlite/qt-sqlite-qt5-vc9.sln
deleted file mode 100644
index 2ec9432..0000000
--- a/qt/sqlite/qt-sqlite-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