From aa6b86dd45e2e1bfd2b54c11b279f5fe8e4cf7b8 Mon Sep 17 00:00:00 2001
From: Morgan McMillian <gilag@monkeystew.com>
Date: Tue, 22 Nov 2016 10:29:39 -0800
Subject: [PATCH] fixed project setup removing hard coded system paths

---
 .cproject          | 12 ++++++------
 bar-descriptor.xml |  6 +++---
 config.pri         | 24 ++++++++++++------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.cproject b/.cproject
index 43fe3e5..35d77b4 100644
--- a/.cproject
+++ b/.cproject
@@ -24,7 +24,7 @@
 							<tool id="com.qnx.qcc.tool.compiler.798411193" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
 								<option id="com.qnx.qcc.option.compiler.optlevel.2057518538" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
 								<option id="com.qnx.qcc.option.compiler.includePath.1927876358" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
-									<listOptionValue builtIn="false" value="C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/bb-cascades-oauth/oauth}"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.compiler.1293946085" superClass="com.qnx.qcc.inputType.compiler"/>
 							</tool>
@@ -37,7 +37,7 @@
 									<listOptionValue builtIn="false" value="kqoauth"/>
 								</option>
 								<option id="com.qnx.qcc.option.linker.libraryPaths.579329698" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/bb-cascades-oauth/oauth/o.le-v7}"/>
 								</option>
 							</tool>
 							<tool id="com.qnx.qcc.tool.archiver.1027686286" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
@@ -73,7 +73,7 @@
 							<tool id="com.qnx.qcc.tool.compiler.1991066453" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
 								<option id="com.qnx.qcc.option.compiler.optlevel.69707806" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
 								<option id="com.qnx.qcc.option.compiler.includePath.1046297223" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
-									<listOptionValue builtIn="false" value="C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/bb-cascades-oauth/oauth}"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.compiler.536509549" superClass="com.qnx.qcc.inputType.compiler"/>
 							</tool>
@@ -86,7 +86,7 @@
 									<listOptionValue builtIn="false" value="kqoauth"/>
 								</option>
 								<option id="com.qnx.qcc.option.linker.libraryPaths.1328267929" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/bb-cascades-oauth/oauth/o.le-v7}"/>
 								</option>
 							</tool>
 							<tool id="com.qnx.qcc.tool.archiver.850632792" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
@@ -122,7 +122,7 @@
 							<tool id="com.qnx.qcc.tool.compiler.194983389" name="QCC Compiler" superClass="com.qnx.qcc.tool.compiler">
 								<option id="com.qnx.qcc.option.compiler.optlevel.535567233" name="Optimization Level" superClass="com.qnx.qcc.option.compiler.optlevel" value="com.qnx.qcc.option.compiler.optlevel.0" valueType="enumerated"/>
 								<option id="com.qnx.qcc.option.compiler.includePath.713543541" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
-									<listOptionValue builtIn="false" value="C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/bb-cascades-oauth/oauth}"/>
 								</option>
 								<inputType id="com.qnx.qcc.inputType.compiler.1181595712" superClass="com.qnx.qcc.inputType.compiler"/>
 							</tool>
@@ -135,7 +135,7 @@
 									<listOptionValue builtIn="false" value="kqoauth"/>
 								</option>
 								<option id="com.qnx.qcc.option.linker.libraryPaths.836842235" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7"/>
+									<listOptionValue builtIn="false" value="${workspace_loc:/bb-cascades-oauth/oauth/o.le-v7}"/>
 								</option>
 							</tool>
 							<tool id="com.qnx.qcc.tool.archiver.1644117066" name="QCC Archiver" superClass="com.qnx.qcc.tool.archiver"/>
diff --git a/bar-descriptor.xml b/bar-descriptor.xml
index ec02d9e..b770577 100644
--- a/bar-descriptor.xml
+++ b/bar-descriptor.xml
@@ -30,18 +30,18 @@
     <configuration name="Device-Debug">
        <platformArchitecture>armle-v7</platformArchitecture>
        <asset path="arm/o.le-v7-g/Goober" entry="true" type="Qnx/Elf">Goober</asset>
-       <asset path="C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7-g/libkqoauth.so" type="Qnx/Elf">lib/libkqoauth.so.1</asset>
+       <asset path="${workspace_loc:/bb-cascades-oauth/oauth/o.le-v7-g/libkqoauth.so}" type="Qnx/Elf">lib/libkqoauth.so.1</asset>
     </configuration>
     <configuration name="Device-Release">
        <entryPointType>Qnx/Cascades</entryPointType>
        <platformArchitecture>armle-v7</platformArchitecture>
        <asset path="arm/o.le-v7/Goober.so" entry="true" type="Qnx/Elf">Goober.so</asset>
-       <asset path="C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7/libkqoauth.so" type="Qnx/Elf">lib/libkqoauth.so.1</asset>
+       <asset path="${workspace_loc:/bb-cascades-oauth/oauth/o.le-v7/libkqoauth.so}" type="Qnx/Elf">lib/libkqoauth.so.1</asset>
     </configuration>
     <configuration name="Device-Profile">
        <platformArchitecture>armle-v7</platformArchitecture>
        <asset path="arm-p/o.le-v7-g/Goober" entry="true" type="Qnx/Elf">Goober</asset>
-       <asset path="C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7/libkqoauth.so" type="Qnx/Elf">lib/libkqoauth.so.1</asset>
+       <asset path="${workspace_loc:/bb-cascades-oauth/oauth/o.le-v7/libkqoauth.so}" type="Qnx/Elf">lib/libkqoauth.so.1</asset>
     </configuration>
     <configuration name="Simulator-Debug">
        <platformArchitecture>x86</platformArchitecture>
diff --git a/config.pri b/config.pri
index f94503d..dc11b65 100644
--- a/config.pri
+++ b/config.pri
@@ -4,29 +4,29 @@ BASEDIR = $$quote($$_PRO_FILE_PWD_)
 device {
     CONFIG(debug, debug|release) {
         profile {
-            INCLUDEPATH += $$quote(C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth)
+            INCLUDEPATH += $$quote($$BASEDIR/../bb-cascades-oauth/oauth)
 
-            DEPENDPATH += $$quote(C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth)
+            DEPENDPATH += $$quote($$BASEDIR/../bb-cascades-oauth/oauth)
 
             LIBS += -lkqoauth
 
-            LIBS += $$quote(-LC:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7)
+            LIBS += $$quote(-L$$BASEDIR/../bb-cascades-oauth/oauth/o.le-v7)
 
-            PRE_TARGETDEPS += $$quote(C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7)
+            PRE_TARGETDEPS += $$quote($$BASEDIR/../bb-cascades-oauth/oauth/o.le-v7)
 
             CONFIG += \
                 config_pri_assets \
                 config_pri_source_group1
         } else {
-            INCLUDEPATH += $$quote(C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth)
+            INCLUDEPATH += $$quote($$BASEDIR/../bb-cascades-oauth/oauth)
 
-            DEPENDPATH += $$quote(C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth)
+            DEPENDPATH += $$quote($$BASEDIR/../bb-cascades-oauth/oauth)
 
             LIBS += -lkqoauth
 
-            LIBS += $$quote(-LC:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7)
+            LIBS += $$quote(-L$$BASEDIR/../bb-cascades-oauth/oauth/o.le-v7)
 
-            PRE_TARGETDEPS += $$quote(C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7)
+            PRE_TARGETDEPS += $$quote($$BASEDIR/../bb-cascades-oauth/oauth/o.le-v7)
 
             CONFIG += \
                 config_pri_assets \
@@ -37,15 +37,15 @@ device {
 
     CONFIG(release, debug|release) {
         !profile {
-            INCLUDEPATH += $$quote(C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth)
+            INCLUDEPATH += $$quote($$BASEDIR/../bb-cascades-oauth/oauth)
 
-            DEPENDPATH += $$quote(C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth)
+            DEPENDPATH += $$quote($$BASEDIR/../bb-cascades-oauth/oauth)
 
             LIBS += -lkqoauth
 
-            LIBS += $$quote(-LC:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7)
+            LIBS += $$quote(-L$$BASEDIR/../bb-cascades-oauth/oauth/o.le-v7)
 
-            PRE_TARGETDEPS += $$quote(C:/Users/morga/workspace/momentics-workspace/bb-cascades-oauth/oauth/o.le-v7)
+            PRE_TARGETDEPS += $$quote($$BASEDIR/../bb-cascades-oauth/oauth/o.le-v7)
 
             CONFIG += \
                 config_pri_assets \