Merge branch '1.3' into master.

Conflicts:
	tests/auto/blackbox/tst_blackbox.h

Change-Id: If48c717626f468c46ad7f1208365275135074404

1 files changed, 1 insertions, 1 deletions

diff --git a/qbs.qbs b/qbs.qbs
index f684e9f2c..b9c7a0171 100644
--- a/qbs.qbs
+++ b/qbs.qbs
@@ -14,7 +14,7 @@ Project {
     property string relativePluginsPath: "../" + libDirName
     property string relativeSearchPath: ".."
     property stringList libRPaths: {
-        if (!project.enableRPath)
+        if (!enableRPath)
             return undefined;
         if (qbs.targetOS.contains("linux"))
             return ["$ORIGIN/../" + libDirName];