diff --git a/scripts/templates/linux/qtcreator.qbs b/scripts/templates/linux/qtcreator.qbs index 0620aee37a1..6626a99c00c 100644 --- a/scripts/templates/linux/qtcreator.qbs +++ b/scripts/templates/linux/qtcreator.qbs @@ -3,10 +3,10 @@ import qbs.Process import qbs.File import qbs.FileInfo import qbs.TextFile -import "%{JS: %{CorrectInitialOFPath}?'../../..':'%{OFPath}'}/libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp +import "../../../libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp Project{ - property string of_root: %{JS: %{CorrectInitialOFPath}?'\'../../..\'':'\'%{OFPath}\''} + property string of_root: "../../.." ofApp { name: { return FileInfo.baseName(sourceDirectory) } @@ -18,18 +18,6 @@ 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() - } ] // additional flags for the project. the of module sets some diff --git a/scripts/templates/linux64/qtcreator.qbs b/scripts/templates/linux64/qtcreator.qbs index 0620aee37a1..6626a99c00c 100644 --- a/scripts/templates/linux64/qtcreator.qbs +++ b/scripts/templates/linux64/qtcreator.qbs @@ -3,10 +3,10 @@ import qbs.Process import qbs.File import qbs.FileInfo import qbs.TextFile -import "%{JS: %{CorrectInitialOFPath}?'../../..':'%{OFPath}'}/libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp +import "../../../libs/openFrameworksCompiled/project/qtcreator/ofApp.qbs" as ofApp Project{ - property string of_root: %{JS: %{CorrectInitialOFPath}?'\'../../..\'':'\'%{OFPath}\''} + property string of_root: "../../.." ofApp { name: { return FileInfo.baseName(sourceDirectory) } @@ -18,18 +18,6 @@ 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() - } ] // additional flags for the project. the of module sets some