diff options
Diffstat (limited to 'src/libs/installer/globals.cpp')
| -rw-r--r-- | src/libs/installer/globals.cpp | 192 |
1 files changed, 6 insertions, 186 deletions
diff --git a/src/libs/installer/globals.cpp b/src/libs/installer/globals.cpp index 66de2fec6..0da4bc3b6 100644 --- a/src/libs/installer/globals.cpp +++ b/src/libs/installer/globals.cpp @@ -31,32 +31,9 @@ #include "globals.h" const char IFW_SERVER[] = "ifw.server"; - -const char IFW_PACKAGE_DISPLAYNAME[] = "ifw.package.displayname"; -const char IFW_PACKAGE_DESCRIPTION[] = "ifw.package.description"; -const char IFW_PACKAGE_VERSION[] = "ifw.package.version"; -const char IFW_PACKAGE_INSTALLEDVERSION[] = "ifw.package.installedversion"; -const char IFW_PACKAGE_RELEASEDATE[] = "ifw.package.releasedate"; -const char IFW_PACKAGE_INSTALLDATE[] = "ifw.package.installdate"; -const char IFW_PACKAGE_UPDATEDATE[] = "ifw.package.updatedate"; -const char IFW_PACKAGE_NAME[] = "ifw.package.name"; -const char IFW_PACKAGE_DEPENDENCIES[] = "ifw.package.dependencies"; -const char IFW_PACKAGE_AUTODEPENDON[] = "ifw.package.autodependon"; -const char IFW_PACKAGE_VIRTUAL[] = "ifw.package.virtual"; -const char IFW_PACKAGE_SORTINGPRIORITY[] = "ifw.package.sortingpriority"; -const char IFW_PACKAGE_SCRIPT[] = "ifw.package.script"; -const char IFW_PACKAGE_DEFAULT[] = "ifw.package.default"; -const char IFW_PACKAGE_ESSETIAL[] = "ifw.package.essential"; -const char IFW_PACKAGE_FORCEDINSTALLATION[] = "ifw.package.forcedinstallation"; -const char IFW_PACKAGE_REPLACES[] = "ifw.package.replaces"; -const char IFW_PACKAGE_DOWNLOADABLEARCHIVES[] = "ifw.package.downloadablearchives"; -const char IFW_PACKAGE_REQUIRESADMINRIGHTS[] = "ifw.package.requiresadminrights"; -const char IFW_PACKAGE_CHECKABLE[] = "ifw.package.checkable"; -const char IFW_PACKAGE_LICENSES[] = "ifw.package.licenses"; -const char IFW_PACKAGE_COMPRESSEDSIZE[] = "ifw.package.compressedsize"; -const char IFW_PACKAGE_UNCOMPRESSEDSIZE[] = "ifw.package.uncompressedsize"; const char IFW_INSTALLER_INSTALLLOG[] = "ifw.installer.installlog"; const char IFW_DEVELOPER_BUILD[] = "ifw.developer.build"; +const char IFW_PACKAGE_INFO[] = "ifw.package.info"; // Internal-only, hidden in --help text const char IFW_PROGRESS_INDICATOR[] = "ifw.progress.indicator"; @@ -70,164 +47,30 @@ namespace QInstaller */ /*! - \fn QInstaller::lcPackageDisplayname() - \internal -*/ - -/*! - \fn QInstaller::lcPackageDescription() - \internal -*/ - -/*! - \fn QInstaller::lcPackageVersion() - \internal -*/ - -/*! - \fn QInstaller::lcPackageInstalledVersion() - \internal -*/ - -/*! - \fn QInstaller::lcPackageReleasedate() - \internal -*/ - -/*! - \fn QInstaller::lcPackageInstallDate() - \internal -*/ - -/*! - \fn QInstaller::lcPackageUpdateDate() - \internal -*/ - -/*! - \fn QInstaller::lcPackageName() - \internal -*/ - -/*! - \fn QInstaller::lcPackageDependencies() - \internal -*/ - -/*! - \fn QInstaller::lcPackageAutodependon() - \internal -*/ - -/*! - \fn QInstaller::lcPackageVirtual() - \internal -*/ - -/*! - \fn QInstaller::lcPackageSortingpriority() - \internal -*/ - -/*! - \fn QInstaller::lcPackageScript() - \internal -*/ - -/*! - \fn QInstaller::lcPackageDefault() - \internal -*/ - -/*! - \fn QInstaller::lcPackageEssential() - \internal -*/ - -/*! - \fn QInstaller::lcPackageForcedinstallation() - \internal -*/ - -/*! - \fn QInstaller::lcPackageReplaces() - \internal -*/ - -/*! - \fn QInstaller::lcPackageDownloadableArchives() - \internal -*/ - -/*! - \fn QInstaller::lcPackageRequiresAdminRights() - \internal -*/ - -/*! - \fn QInstaller::lcPackageCheckable() - \internal -*/ - -/*! - \fn QInstaller::lcPackageLicenses() - \internal -*/ - -/*! - \fn QInstaller::lcPackageUncompressedSize() - \internal -*/ - -/*! - \fn QInstaller::lcPackageCompressedSize() + \fn QInstaller::lcInstallerInstallLog() \internal */ /*! - \fn QInstaller::lcInstallerInstallLog() + \fn QInstaller::lcProgressIndicator() \internal */ /*! - \fn QInstaller::lcProgressIndicator() + \fn QInstaller::lcDeveloperBuild() \internal */ /*! - \fn QInstaller::lcDeveloperBuild() + \fn QInstaller::lcPackageInfo() \internal */ Q_LOGGING_CATEGORY(lcServer, IFW_SERVER) - -Q_LOGGING_CATEGORY(lcPackageDisplayname, IFW_PACKAGE_DISPLAYNAME); -Q_LOGGING_CATEGORY(lcPackageDescription, IFW_PACKAGE_DESCRIPTION) -Q_LOGGING_CATEGORY(lcPackageVersion, IFW_PACKAGE_VERSION) -Q_LOGGING_CATEGORY(lcPackageInstalledVersion, IFW_PACKAGE_INSTALLEDVERSION) -Q_LOGGING_CATEGORY(lcPackageReleasedate, IFW_PACKAGE_RELEASEDATE) -Q_LOGGING_CATEGORY(lcPackageInstallDate, IFW_PACKAGE_INSTALLDATE) -Q_LOGGING_CATEGORY(lcPackageUpdateDate, IFW_PACKAGE_UPDATEDATE) -Q_LOGGING_CATEGORY(lcPackageName, IFW_PACKAGE_NAME) -Q_LOGGING_CATEGORY(lcPackageDependencies, IFW_PACKAGE_DEPENDENCIES) -Q_LOGGING_CATEGORY(lcPackageAutodependon, IFW_PACKAGE_AUTODEPENDON) -Q_LOGGING_CATEGORY(lcPackageVirtual, IFW_PACKAGE_VIRTUAL) -Q_LOGGING_CATEGORY(lcPackageSortingpriority, IFW_PACKAGE_SORTINGPRIORITY) -Q_LOGGING_CATEGORY(lcPackageScript, IFW_PACKAGE_SCRIPT) -Q_LOGGING_CATEGORY(lcPackageDefault, IFW_PACKAGE_DEFAULT) -Q_LOGGING_CATEGORY(lcPackageEssential, IFW_PACKAGE_ESSETIAL) -Q_LOGGING_CATEGORY(lcPackageForcedinstallation, IFW_PACKAGE_FORCEDINSTALLATION) -Q_LOGGING_CATEGORY(lcPackageReplaces, IFW_PACKAGE_REPLACES) -Q_LOGGING_CATEGORY(lcPackageDownloadableArchives, IFW_PACKAGE_DOWNLOADABLEARCHIVES) -Q_LOGGING_CATEGORY(lcPackageRequiresAdminRights, IFW_PACKAGE_REQUIRESADMINRIGHTS) -Q_LOGGING_CATEGORY(lcPackageCheckable, IFW_PACKAGE_CHECKABLE) -Q_LOGGING_CATEGORY(lcPackageLicenses, IFW_PACKAGE_LICENSES) -Q_LOGGING_CATEGORY(lcPackageUncompressedSize, IFW_PACKAGE_UNCOMPRESSEDSIZE) -Q_LOGGING_CATEGORY(lcPackageCompressedSize, IFW_PACKAGE_COMPRESSEDSIZE) Q_LOGGING_CATEGORY(lcInstallerInstallLog, IFW_INSTALLER_INSTALLLOG) Q_LOGGING_CATEGORY(lcProgressIndicator, IFW_PROGRESS_INDICATOR) - Q_LOGGING_CATEGORY(lcDeveloperBuild, IFW_DEVELOPER_BUILD) +Q_LOGGING_CATEGORY(lcPackageInfo, IFW_PACKAGE_INFO) /*! Returns available logging categories. @@ -235,29 +78,6 @@ Q_LOGGING_CATEGORY(lcDeveloperBuild, IFW_DEVELOPER_BUILD) QStringList loggingCategories() { static QStringList categories = QStringList() - << QLatin1String(IFW_PACKAGE_DISPLAYNAME) - << QLatin1String(IFW_PACKAGE_DESCRIPTION) - << QLatin1String(IFW_PACKAGE_VERSION) - << QLatin1String(IFW_PACKAGE_INSTALLEDVERSION) - << QLatin1String(IFW_PACKAGE_RELEASEDATE) - << QLatin1String(IFW_PACKAGE_INSTALLDATE) - << QLatin1String(IFW_PACKAGE_UPDATEDATE) - << QLatin1String(IFW_PACKAGE_NAME) - << QLatin1String(IFW_PACKAGE_DEPENDENCIES) - << QLatin1String(IFW_PACKAGE_AUTODEPENDON) - << QLatin1String(IFW_PACKAGE_VIRTUAL) - << QLatin1String(IFW_PACKAGE_SORTINGPRIORITY) - << QLatin1String(IFW_PACKAGE_SCRIPT) - << QLatin1String(IFW_PACKAGE_DEFAULT) - << QLatin1String(IFW_PACKAGE_ESSETIAL) - << QLatin1String(IFW_PACKAGE_FORCEDINSTALLATION) - << QLatin1String(IFW_PACKAGE_REPLACES) - << QLatin1String(IFW_PACKAGE_DOWNLOADABLEARCHIVES) - << QLatin1String(IFW_PACKAGE_REQUIRESADMINRIGHTS) - << QLatin1String(IFW_PACKAGE_CHECKABLE) - << QLatin1String(IFW_PACKAGE_LICENSES) - << QLatin1String(IFW_PACKAGE_UNCOMPRESSEDSIZE) - << QLatin1String(IFW_PACKAGE_COMPRESSEDSIZE) << QLatin1String(IFW_INSTALLER_INSTALLLOG) << QLatin1String(IFW_SERVER); return categories; |