From 9407b867943e880a90ae0b3354c06c8368f17bb0 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 1 Aug 2013 14:46:00 +0200 Subject: fix online only installer creation Task-number: QTIFW-319 Change-Id: I1f66f80b952742e7ff21ee6960120271e1579fb9 Reviewed-by: Niels Weber Reviewed-by: Karsten Heimrich --- tools/binarycreator/binarycreator.cpp | 2 +- tools/common/repositorygen.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 0209f09a0..8792eb537 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -687,7 +687,7 @@ int main(int argc, char **argv) } if (onlineOnly) { - filteredPackages.append(QLatin1String("XXXXXXXXXXXXXXXXX_online_XXXXXXXXXXXXXXXXX")); + filteredPackages.append(QLatin1String("X_fake_filter_component_for_online_only_installer_X")); ftype = QInstallerTools::Include; } diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index 20add6d81..359d1ba31 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -446,7 +446,8 @@ PackageInfoVector QInstallerTools::createListOfPackages(const QString &packagesD qDebug() << QString::fromLatin1("- it provides the package %1 - %2").arg(info.name, info.version); } - if (!packagesToFilter->isEmpty()) { + if (!packagesToFilter->isEmpty() && packagesToFilter->at(0) != QString::fromLatin1( + "X_fake_filter_component_for_online_only_installer_X")) { qWarning() << "The following explicitly given packages could not be found\n in package directory:" << *packagesToFilter; } -- cgit v1.2.3