From b8dc0c73135aaf355daf98fabfa18be0caae7140 Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 25 Mar 2013 12:29:27 +0100 Subject: Fully qualify function calls. Fix minor typos. Change-Id: I36cc096f3195e69bf027aa629d31ffac1d519732 Reviewed-by: Tim Jenssen --- tools/binarycreator/binarycreator.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tools/binarycreator/binarycreator.cpp') diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 67ed1d5c5..80c083208 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -693,13 +693,14 @@ int main(int argc, char **argv) qDebug() << "Parsed arguments, ok."; int exitCode = EXIT_FAILURE; - const QString tmpMetaDir = createTemporaryDirectory(); + const QString tmpMetaDir = QInstaller::createTemporaryDirectory(); try { const Settings settings = Settings::fromFileAndPrefix(configFile, QFileInfo(configFile).absolutePath()); - QInstallerTools::PackageInfoVector packages = createListOfPackages(packagesDirectory, + QInstallerTools::PackageInfoVector packages = QInstallerTools::createListOfPackages(packagesDirectory, filteredPackages, ftype); - copyMetaData(tmpMetaDir, packagesDirectory, packages, settings.applicationName(), + QInstallerTools::copyMetaData(tmpMetaDir, packagesDirectory, packages, settings.applicationName(), settings.applicationVersion()); + copyConfigData(configFile, tmpMetaDir + QLatin1String("/installer-config")); { QSettings confInternal(tmpMetaDir + QLatin1String("/config/config-internal.ini") @@ -748,10 +749,11 @@ int main(int argc, char **argv) QFile::remove(resource); } } catch (const Error &e) { - std::cerr << "caught exception: " << e.message() << std::endl; + std::cerr << "Caught exception: " << e.message() << std::endl; } catch (...) { std::cerr << "Unknown exception caught" << std::endl; } - removeDirectory(tmpMetaDir, true); + + QInstaller::removeDirectory(tmpMetaDir, true); return exitCode; } -- cgit v1.2.3