Commit 92c23296 authored by Christian Kandeler's avatar Christian Kandeler

RemoteLinux: Fix plugin deployment.

No symbolic links are being created for those.

Change-Id: Icecd7441626cc3862bad6c2d4ab000c2f060ec52
Reviewed-on: http://codereview.qt-project.org/5320Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
parent 4e7d0d9c
......@@ -154,22 +154,26 @@ QString DeployableFilesPerProFile::localExecutableFilePath() const
QStringList DeployableFilesPerProFile::localLibraryFilePaths() const
{
QStringList list;
if (!d->targetInfo.valid || d->projectType != LibraryTemplate)
return QStringList();
return list;
QString basePath = d->targetInfo.workingDir + QLatin1String("/lib");
const bool isStatic = d->config.contains(QLatin1String("static"))
|| d->config.contains(QLatin1String("staticlib"));
basePath += d->targetInfo.target + QLatin1String(isStatic ? ".a" : ".so");
basePath = QDir::cleanPath(basePath);
const QChar dot(QLatin1Char('.'));
const QString filePathMajor = basePath + dot
+ QString::number(d->projectVersion.major);
const QString filePathMinor = filePathMajor + dot
+ QString::number(d->projectVersion.minor);
const QString filePathPatch = filePathMinor + dot
+ QString::number(d->projectVersion.patch);
return QStringList() << filePathPatch << filePathMinor << filePathMajor
<< basePath;
if (!isStatic && !d->config.contains(QLatin1String("plugin"))) {
const QChar dot(QLatin1Char('.'));
const QString filePathMajor = basePath + dot
+ QString::number(d->projectVersion.major);
const QString filePathMinor = filePathMajor + dot
+ QString::number(d->projectVersion.minor);
const QString filePathPatch = filePathMinor + dot
+ QString::number(d->projectVersion.patch);
list << filePathPatch << filePathMinor << filePathMajor;
}
return list << basePath;
}
QString DeployableFilesPerProFile::remoteExecutableFilePath() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment