diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index e85790e3..e13b0105 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -141,8 +141,8 @@ def LookupSources(env, variant_dir, src_dir, duplicate=True, src_filter=None):
 
     for item in _match_sources(src_dir, src_filter or SRC_DEFAULT_FILTER):
         _reldir = dirname(item)
-        _src_dir = join(src_dir, _reldir)
-        _var_dir = join(variant_dir, _reldir)
+        _src_dir = join(src_dir, _reldir) if _reldir else src_dir
+        _var_dir = join(variant_dir, _reldir) if _reldir else variant_dir
 
         if _var_dir not in variants:
             variants.append(_var_dir)
@@ -173,11 +173,11 @@ def BuildFramework(env):
                  framework)
 
 
-def BuildLibrary(env, variant_dir, library_dir, src_filter=None):
+def BuildLibrary(env, variant_dir, src_dir, src_filter=None):
     lib = env.Clone()
     return lib.Library(
         lib.subst(variant_dir),
-        lib.LookupSources(variant_dir, library_dir, src_filter=src_filter)
+        lib.LookupSources(variant_dir, src_dir, src_filter=src_filter)
     )
 
 
diff --git a/platformio/ide/tpls/qtcreator/platformio.pro.tpl b/platformio/ide/tpls/qtcreator/platformio.pro.tpl
index 14718f61..ff380cb6 100644
--- a/platformio/ide/tpls/qtcreator/platformio.pro.tpl
+++ b/platformio/ide/tpls/qtcreator/platformio.pro.tpl
@@ -2,19 +2,17 @@ win32 {
     HOMEDIR += $$(USERPROFILE)
 }
 else {
-    HOMEDIR += $$(PWD)
+    HOMEDIR += $$(HOME)
 }
 
 % for include in includes:
 % if include.startswith(user_home_dir):
-INCLUDEPATH += "${HOME}{{include.replace(user_home_dir, "")}}"
+INCLUDEPATH += "$$(HOMEDIR){{include.replace(user_home_dir, "")}}"
 % else:
 INCLUDEPATH += "{{include}}"
 % end
 % end
 
-win32:INCLUDEPATH ~= s,/,\\,g
-
 % for define in defines:
 DEFINES += "{{define}}"
 % end