Fix project name with space(s) have no *.vcxproj.filters file

Fixes: QTVSADDINBUG-1067
Change-Id: I3f4e194c647484e7a2975fcae2a61395f04c2402
Reviewed-by: Miguel Costa <miguel.costa@qt.io>

9 files changed, 28 insertions, 28 deletions

diff --git a/Templates/console/console.vstemplate_TT b/Templates/console/console.vstemplate_TT
index 96452487..914757a6 100644
--- a/Templates/console/console.vstemplate_TT
+++ b/Templates/console/console.vstemplate_TT
@@ -56,13 +56,13 @@
         <ProjectTypeTag>IoT</ProjectTypeTag>
     </TemplateData>
     <TemplateContent>
-        <Project TargetFileName="$safeprojectname$.vcxproj"
+        <Project TargetFileName="$projectname$.vcxproj"
                  File="console.vcxproj"
                  ReplaceParameters="true">
             <ProjectItem ReplaceParameters="false"
                          OpenInEditor="true">main.cpp</ProjectItem>
             <ProjectItem ReplaceParameters="false"
-                         TargetFileName="$safeprojectname$.vcxproj.filters">console.vcxproj.filters</ProjectItem>
+                         TargetFileName="$projectname$.vcxproj.filters">console.vcxproj.filters</ProjectItem>
         </Project>
     </TemplateContent>
     <WizardExtension>
diff --git a/Templates/designer/designer.vstemplate_TT b/Templates/designer/designer.vstemplate_TT
index 1ac89e49..318d6c2b 100644
--- a/Templates/designer/designer.vstemplate_TT
+++ b/Templates/designer/designer.vstemplate_TT
@@ -55,7 +55,7 @@
         <ProjectTypeTag>Library</ProjectTypeTag>
     </TemplateData>
     <TemplateContent>
-        <Project TargetFileName="$safeprojectname$.vcxproj"
+        <Project TargetFileName="$projectname$.vcxproj"
                  File="designer.vcxproj"
                  ReplaceParameters="true">
             <ProjectItem ReplaceParameters="true"
@@ -72,7 +72,7 @@
             <ProjectItem ReplaceParameters="true"
                          TargetFileName="$headerfilename$">widget.h</ProjectItem>
             <ProjectItem ReplaceParameters="true"
-                         TargetFileName="$safeprojectname$.vcxproj.filters">designer.vcxproj.filters</ProjectItem>
+                         TargetFileName="$projectname$.vcxproj.filters">designer.vcxproj.filters</ProjectItem>
         </Project>
     </TemplateContent>
     <WizardExtension>
diff --git a/Templates/empty/empty.vstemplate_TT b/Templates/empty/empty.vstemplate_TT
index c83d9dde..4baca492 100644
--- a/Templates/empty/empty.vstemplate_TT
+++ b/Templates/empty/empty.vstemplate_TT
@@ -54,11 +54,11 @@
         <ProjectTypeTag>Qt</ProjectTypeTag>
     </TemplateData>
     <TemplateContent>
-        <Project TargetFileName="$safeprojectname$.vcxproj"
+        <Project TargetFileName="$projectname$.vcxproj"
                  File="empty.vcxproj"
                  ReplaceParameters="true">
             <ProjectItem ReplaceParameters="true"
-                         TargetFileName="$safeprojectname$.vcxproj.filters">empty.vcxproj.filters</ProjectItem>
+                         TargetFileName="$projectname$.vcxproj.filters">empty.vcxproj.filters</ProjectItem>
             <ProjectItem ReplaceParameters="false">empty.ico</ProjectItem>
         </Project>
     </TemplateContent>
diff --git a/Templates/gui/CMakeLists.txt b/Templates/gui/CMakeLists.txt
index 69c40988..3abed828 100644
--- a/Templates/gui/CMakeLists.txt
+++ b/Templates/gui/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project($safeprojectname$ LANGUAGES CXX)
+project($projectname$ LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -26,21 +26,21 @@ set(PROJECT_SOURCES
 )
 
 if(Qt6)
-    qt_add_executable($safeprojectname$ MANUAL_FINALIZATION ${PROJECT_SOURCES})
+    qt_add_executable($projectname$ MANUAL_FINALIZATION ${PROJECT_SOURCES})
 else()
-    add_executable($safeprojectname$ ${PROJECT_SOURCES})
+    add_executable($projectname$ ${PROJECT_SOURCES})
 endif()
 
-set_target_properties($safeprojectname$
+set_target_properties($safeprojectnname$
     PROPERTIES
         WIN32_EXECUTABLE TRUE
 )
 
-target_link_libraries($safeprojectname$
+target_link_libraries($projectname$
     PUBLIC
         ${QT_LIBS}
 )
 
 if(Qt6)
-    qt_finalize_executable($safeprojectname$)
+    qt_finalize_executable($projectname$)
 endif()
diff --git a/Templates/gui/gui.vstemplate_TT b/Templates/gui/gui.vstemplate_TT
index a560027a..047fe407 100644
--- a/Templates/gui/gui.vstemplate_TT
+++ b/Templates/gui/gui.vstemplate_TT
@@ -55,7 +55,7 @@
         <ProjectTypeTag>Desktop</ProjectTypeTag>
     </TemplateData>
     <TemplateContent>
-        <Project TargetFileName="$safeprojectname$.vcxproj"
+        <Project TargetFileName="$projectname$.vcxproj"
                  File="gui.vcxproj"
                  ReplaceParameters="true">
             <ProjectItem ReplaceParameters="true">main.cpp</ProjectItem>
@@ -69,7 +69,7 @@
             <ProjectItem ReplaceParameters="true"
                          TargetFileName="$uifilename$">widget.ui</ProjectItem>
             <ProjectItem ReplaceParameters="true"
-                         TargetFileName="$safeprojectname$.vcxproj.filters">gui.vcxproj.filters</ProjectItem>
+                         TargetFileName="$projectname$.vcxproj.filters">gui.vcxproj.filters</ProjectItem>
             <ProjectItem ReplaceParameters="false">gui.ico</ProjectItem>
             <ProjectItem ReplaceParameters="true"
                          TargetFileName="$qrcfilename$">widget.qrc</ProjectItem>
diff --git a/Templates/lib/lib.vstemplate_TT b/Templates/lib/lib.vstemplate_TT
index a913dec1..620623d9 100644
--- a/Templates/lib/lib.vstemplate_TT
+++ b/Templates/lib/lib.vstemplate_TT
@@ -57,7 +57,7 @@
         <ProjectTypeTag>IoT</ProjectTypeTag>
     </TemplateData>
     <TemplateContent>
-        <Project TargetFileName="$safeprojectname$.vcxproj"
+        <Project TargetFileName="$projectname$.vcxproj"
                  File="lib.vcxproj"
                  ReplaceParameters="true">
             <ProjectItem ReplaceParameters="true"
@@ -70,7 +70,7 @@
             <ProjectItem ReplaceParameters="false">stdafx.cpp</ProjectItem>
             <ProjectItem ReplaceParameters="false">stdafx.h</ProjectItem>
             <ProjectItem ReplaceParameters="true"
-                         TargetFileName="$safeprojectname$.vcxproj.filters">lib.vcxproj.filters</ProjectItem>
+                         TargetFileName="$projectname$.vcxproj.filters">lib.vcxproj.filters</ProjectItem>
         </Project>
     </TemplateContent>
     <WizardExtension>
diff --git a/Templates/quick/CMakeLists.txt b/Templates/quick/CMakeLists.txt
index d02f5efb..9c73e11b 100644
--- a/Templates/quick/CMakeLists.txt
+++ b/Templates/quick/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project($safeprojectname$ LANGUAGES CXX)
+project($projectname$ LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -23,27 +23,27 @@ set(PROJECT_SOURCES
 )
 
 if(Qt6)
-    qt_add_executable($safeprojectname$ MANUAL_FINALIZATION ${PROJECT_SOURCES})
+    qt_add_executable($projectname$ MANUAL_FINALIZATION ${PROJECT_SOURCES})
 else()
-    add_executable($safeprojectname$ ${PROJECT_SOURCES})
+    add_executable($projectname$ ${PROJECT_SOURCES})
 endif()
 
-set_target_properties($safeprojectname$
+set_target_properties($projectname$
     PROPERTIES
         WIN32_EXECUTABLE TRUE
 )
 
-target_compile_definitions($safeprojectname$
+target_compile_definitions($projectname$
   PRIVATE
     $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>
 )
 
-target_link_libraries($safeprojectname$
+target_link_libraries($projectname$
     PUBLIC
         ${QT_LIBS}
 )
 
 if(Qt6)
-    qt_import_qml_plugins($safeprojectname$)
-    qt_finalize_executable($safeprojectname$)
+    qt_import_qml_plugins($projectname$)
+    qt_finalize_executable($projectname$)
 endif()
diff --git a/Templates/quick/quick.vstemplate_TT b/Templates/quick/quick.vstemplate_TT
index ae9e5065..a708e727 100644
--- a/Templates/quick/quick.vstemplate_TT
+++ b/Templates/quick/quick.vstemplate_TT
@@ -57,11 +57,11 @@
         <ProjectTypeTag>IoT</ProjectTypeTag>
     </TemplateData>
     <TemplateContent>
-        <Project TargetFileName="$safeprojectname$.vcxproj"
+        <Project TargetFileName="$projectname$.vcxproj"
                  File="quick.vcxproj"
                  ReplaceParameters="true">
             <ProjectItem ReplaceParameters="true"
-                         TargetFileName="$safeprojectname$.vcxproj.filters">quick.vcxproj.filters</ProjectItem>
+                         TargetFileName="$projectname$.vcxproj.filters">quick.vcxproj.filters</ProjectItem>
             <ProjectItem ReplaceParameters="false">quick.ico</ProjectItem>
             <ProjectItem ReplaceParameters="true">main.cpp</ProjectItem>
             <ProjectItem ReplaceParameters="true">main.qml</ProjectItem>
diff --git a/Templates/server/server.vstemplate_TT b/Templates/server/server.vstemplate_TT
index cb1569d2..915ac86a 100644
--- a/Templates/server/server.vstemplate_TT
+++ b/Templates/server/server.vstemplate_TT
@@ -55,7 +55,7 @@
         <ProjectTypeTag>Desktop</ProjectTypeTag>
     </TemplateData>
     <TemplateContent>
-        <Project TargetFileName="$safeprojectname$.vcxproj"
+        <Project TargetFileName="$projectname$.vcxproj"
                  File="server.vcxproj"
                  ReplaceParameters="true">
             <ProjectItem ReplaceParameters="true"
@@ -67,7 +67,7 @@
             <ProjectItem ReplaceParameters="true"
                          TargetFileName="$pro_name$.rc">server.rc</ProjectItem>
             <ProjectItem ReplaceParameters="true"
-                         TargetFileName="$safeprojectname$.vcxproj.filters">server.vcxproj.filters</ProjectItem>
+                         TargetFileName="$projectname$.vcxproj.filters">server.vcxproj.filters</ProjectItem>
             <ProjectItem ReplaceParameters="true"
                          OpenInEditor="true"
                          TargetFileName="$sourcefilename$">source.cpp</ProjectItem>