bugfix for qtcreator wizard. closes #6461 (#6462)

support qtcreator 4.10 #changelog #qtcreator
openframeworks · Nov 20, 2019 · 8d8c8ff · 8d8c8ff
1 parent 637dbe8
commit 8d8c8ff
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/scripts/qtcreator/templates/wizards/openFrameworks/qtcreator.qbs b/scripts/qtcreator/templates/wizards/openFrameworks/qtcreator.qbs
@@ -6,7 +6,7 @@ import qbs.TextFile
 import "%{JS: %{CorrectInitialOFPath}?'../../..':'%{OFPath}'}/libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp
 
 Project{
-    property string of_root: %{JS: %{CorrectInitialOFPath}?'\'../../..\'':'\'%{OFPath}\''}
+    property string of_root: '%{JS: %{CorrectInitialOFPath}?'../../..':'%{OFPath}'}'
 
     ofApp {
         name: { return FileInfo.baseName(sourceDirectory) }
@@ -19,16 +19,16 @@ Project{
 
         of.addons: [
             %{JS:
-                [].concat(%{ofx3DModelLoader}       ? ['\'ofx3DModelLoader\'']       : [])
-                .concat(%{ofxAssimpModelLoader}     ? ['\'ofxAssimpModelLoader\'']   : [])
-                .concat(%{ofxGui}                   ? ['\'ofxGui\'']                 : [])
-                .concat(%{ofxKinect}                ? ['\'ofxKinect\'']              : [])
-                .concat(%{ofxNetwork}               ? ['\'ofxNetwork\'']             : [])
-                .concat(%{ofxOpenCv}                ? ['\'ofxOpenCv\'']              : [])
-                .concat(%{ofxOsc}                   ? ['\'ofxOsc\'']                 : [])
-                .concat(%{ofxSvg}                   ? ['\'ofxSvg\'']                 : [])
-                .concat(%{ofxVectorGraphics}        ? ['\'ofxVectorGraphics\'']      : [])
-                .concat(%{ofxXmlSettings}           ? ['\'ofxXmlSettings\'']         : []).toString()
+                [].concat(%{ofx3DModelLoader}       ? ["'ofx3DModelLoader'"]       : [])
+                .concat(%{ofxAssimpModelLoader}     ? ["'ofxAssimpModelLoader'"]   : [])
+                .concat(%{ofxGui}                   ? ["'ofxGui'"]                 : [])
+                .concat(%{ofxKinect}                ? ["'ofxKinect'"]              : [])
+                .concat(%{ofxNetwork}               ? ["'ofxNetwork'"]             : [])
+                .concat(%{ofxOpenCv}                ? ["'ofxOpenCv'"]              : [])
+                .concat(%{ofxOsc}                   ? ["'ofxOsc'"]                 : [])
+                .concat(%{ofxSvg}                   ? ["'ofxSvg'"]                 : [])
+                .concat(%{ofxVectorGraphics}        ? ["'ofxVectorGraphics'"]      : [])
+                .concat(%{ofxXmlSettings}           ? ["'ofxXmlSettings'"]         : []).toString()
             }
         ]
 

diff --git a/scripts/qtcreator/templates/wizards/openFrameworksUpdate/qtcreator_update.qbs b/scripts/qtcreator/templates/wizards/openFrameworksUpdate/qtcreator_update.qbs
@@ -6,7 +6,7 @@ import qbs.TextFile
 import "%{JS: %{CorrectInitialOFPath}?'../../..':'%{OFPath}'}/libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp
 
 Project{
-    property string of_root: %{JS: %{CorrectInitialOFPath}?'\'../../..\'':'\'%{OFPath}\''}
+    property string of_root: '%{JS: %{CorrectInitialOFPath}?'../../..':'%{OFPath}'}'
 
     ofApp {
         name: { return FileInfo.baseName(sourceDirectory) }

diff --git a/scripts/qtcreator/templates/wizards/openFrameworksUpdate/qtcreator_update_no_addons.qbs b/scripts/qtcreator/templates/wizards/openFrameworksUpdate/qtcreator_update_no_addons.qbs
@@ -6,7 +6,7 @@ import qbs.TextFile
 import "%{JS: %{CorrectInitialOFPath}?'../../..':'%{OFPath}'}/libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp
 
 Project{
-    property string of_root: %{JS: %{CorrectInitialOFPath}?'\'../../..\'':'\'%{OFPath}\''}
+    property string of_root: '%{JS: %{CorrectInitialOFPath}?'../../..':'%{OFPath}'}'
 
     ofApp {
         name: { return FileInfo.baseName(sourceDirectory) }