Support configurable library location in qbs build.

And also in the qbs sub-project (for the qbs and qmake builds). This
becomes possible with the qbs submodule update that is part of this
patch.

Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2014-02-27 18:18:54 +01:00
parent d14676dc10
commit c8881e7ca2
9 changed files with 18 additions and 15 deletions

View File

@@ -727,7 +727,7 @@ QString QbsProject::pluginsBaseDirectory() const
if (!qbsInstallDir.isEmpty())
return qbsInstallDir + QLatin1String("/lib/");
return QDir::cleanPath(QCoreApplication::applicationDirPath()
+ QLatin1String("/../lib/qtcreator"));
+ QLatin1String("/../" IDE_LIBRARY_BASENAME "/qtcreator"));
}
} // namespace Internal