summaryrefslogtreecommitdiffstats
path: root/tools/common
diff options
context:
space:
mode:
Diffstat (limited to 'tools/common')
-rw-r--r--tools/common/repositorygen.cpp12
-rw-r--r--tools/common/repositorygen.h1
2 files changed, 9 insertions, 4 deletions
diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index e25af0dd6..b119c392a 100644
--- a/tools/common/repositorygen.cpp
+++ b/tools/common/repositorygen.cpp
@@ -73,6 +73,13 @@ void QInstallerTools::printRepositoryGenOptions()
std::cout << " --ignore-invalid-packages Ignore all invalid packages instead of aborting." << std::endl;
}
+QString QInstallerTools::makePathAbsolute(const QString &path)
+{
+ if (QFileInfo(path).isRelative())
+ return QDir::current().absoluteFilePath(path);
+ return path;
+}
+
void QInstallerTools::copyWithException(const QString &source, const QString &target, const QString &kind)
{
qDebug() << QString::fromLatin1("Copying associated %1 file '%2'").arg(kind, source);
@@ -104,10 +111,7 @@ void QInstallerTools::generateMetaDataDirectory(const QString &outDir, const QSt
const PackageInfoVector &packages, const QString &appName, const QString &appVersion,
const QString &redirectUpdateUrl)
{
- QString metapath = outDir;
- if (QFileInfo(metapath).isRelative())
- metapath = QDir::cleanPath(QDir::current().absoluteFilePath(metapath));
-
+ const QString metapath = makePathAbsolute(outDir);
if (!QFile::exists(metapath))
QInstaller::mkpath(metapath);
diff --git a/tools/common/repositorygen.h b/tools/common/repositorygen.h
index 71426ba7f..5085d526b 100644
--- a/tools/common/repositorygen.h
+++ b/tools/common/repositorygen.h
@@ -65,6 +65,7 @@ enum FilterType {
Exclude
};
+QString makePathAbsolute(const QString &path);
QHash<QString, QString> buildPathToVersionMapping(const PackageInfoVector &info);
void copyWithException(const QString &source, const QString &target, const QString &kind = QString());