diff options
author | Katja Marttila <katja.marttila@qt.io> | 2020-02-13 07:55:23 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-02-13 11:45:03 +0000 |
commit | 3594bb0d1958d4f69d316738232b713fa4fe5925 (patch) | |
tree | aedaa92e5b4407ce596f765fc7fc330a8c3cff71 | |
parent | 77820bf2a318e4ac79b55f5e51361f159d561ac4 (diff) |
Move CLI options from /sdk to /libs for access from installer extensions
Change-Id: I657645f2126813a93bc38626fabf46deb4711791
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r-- | src/libs/installer/constants.h | 47 | ||||
-rw-r--r-- | src/sdk/constants.h | 78 | ||||
-rw-r--r-- | src/sdk/installerbase.cpp | 4 | ||||
-rw-r--r-- | src/sdk/sdk.pro | 1 |
4 files changed, 47 insertions, 83 deletions
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h index 26c2a7dfe..f43dc2e54 100644 --- a/src/libs/installer/constants.h +++ b/src/libs/installer/constants.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -30,6 +30,7 @@ #define CONSTANTS_H #include <QtCore/QString> +#include <QtCore/QStringList> namespace QInstaller { @@ -94,7 +95,49 @@ static const QLatin1String scSaveDefaultRepositories("SaveDefaultRepositories"); static const QLatin1String scRepositoryCategoryDisplayName("RepositoryCategoryDisplayName"); const char scRelocatable[] = "@RELOCATABLE_PATH@"; - } +namespace CommandLineOptions { + +const char HelpShort[] = "h"; +const char HelpLong[] = "help"; +const char Version[] = "version"; +const char FrameworkVersion[] = "framework-version"; +const char VerboseShort[] = "v"; +const char VerboseLong[] = "verbose"; +const char Proxy[] = "proxy"; +const char NoProxy[] = "no-proxy"; +const char Script[] = "script"; +const char CheckUpdates[] = "checkupdates"; +const char Updater[] = "updater"; +const char ManagePackages[] = "manage-packages"; +const char NoForceInstallation[] = "no-force-installations"; +const char ShowVirtualComponents[] = "show-virtual-components"; +const char LoggingRules[] = "logging-rules"; +const char CreateLocalRepository[] = "create-local-repository"; +const char AddRepository[] = "addRepository"; +const char AddTmpRepository[] = "addTempRepository"; +const char SetTmpRepository[] = "setTempRepository"; +const char StartServer[] = "startserver"; +const char StartClient[] = "startclient"; +const char InstallCompressedRepository[] = "installCompressedRepository"; +const char SilentUpdate[] = "silentUpdate"; +const char UpdatePackages[] = "updatePackages"; +const char ListInstalledPackages[] = "listInstalledPackages"; +const char ListPackages[] = "listPackages"; +const char InstallPackages[] = "installPackages"; +const char InstallDefault[] = "installDefault"; +const char TargetDir[] = "targetDir"; +const char Platform[] = "platform"; +const char SquishPort[] = "squish-port"; + +static const QStringList scCommandLineInterfaceOptions = { + QLatin1String(ListInstalledPackages), + QLatin1String(ListPackages), + QLatin1String(UpdatePackages), + QLatin1String(InstallPackages), + QLatin1String(InstallDefault) +}; + +} // namespace CommandLineOptions #endif // CONSTANTS_H diff --git a/src/sdk/constants.h b/src/sdk/constants.h deleted file mode 100644 index 1966983a0..000000000 --- a/src/sdk/constants.h +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Installer Framework. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -**************************************************************************/ - -#ifndef CONSTANTS_H -#define CONSTANTS_H - -#include <QtCore/QStringList> - -namespace CommandLineOptions { - -const char HelpShort[] = "h"; -const char HelpLong[] = "help"; -const char Version[] = "version"; -const char FrameworkVersion[] = "framework-version"; -const char VerboseShort[] = "v"; -const char VerboseLong[] = "verbose"; -const char Proxy[] = "proxy"; -const char NoProxy[] = "no-proxy"; -const char Script[] = "script"; -const char CheckUpdates[] = "checkupdates"; -const char Updater[] = "updater"; -const char ManagePackages[] = "manage-packages"; -const char NoForceInstallation[] = "no-force-installations"; -const char ShowVirtualComponents[] = "show-virtual-components"; -const char LoggingRules[] = "logging-rules"; -const char CreateLocalRepository[] = "create-local-repository"; -const char AddRepository[] = "addRepository"; -const char AddTmpRepository[] = "addTempRepository"; -const char SetTmpRepository[] = "setTempRepository"; -const char StartServer[] = "startserver"; -const char StartClient[] = "startclient"; -const char InstallCompressedRepository[] = "installCompressedRepository"; -const char SilentUpdate[] = "silentUpdate"; -const char UpdatePackages[] = "updatePackages"; -const char ListInstalledPackages[] = "listInstalledPackages"; -const char ListPackages[] = "listPackages"; -const char InstallPackages[] = "installPackages"; -const char InstallDefault[] = "installDefault"; -const char TargetDir[] = "targetDir"; -const char Platform[] = "platform"; -const char SquishPort[] = "squish-port"; - -static const QStringList scCommandLineInterfaceOptions = { - QLatin1String(ListInstalledPackages), - QLatin1String(ListPackages), - QLatin1String(UpdatePackages), - QLatin1String(InstallPackages), - QLatin1String(InstallDefault) -}; - -} // namespace CommandLineOptions - -#endif // CONSTANTS_H diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index ce8106c60..b63c911fa 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -26,7 +26,6 @@ ** **************************************************************************/ -#include "constants.h" #include "commandlineparser.h" #include "installerbase.h" #include "installerbasecommons.h" @@ -46,6 +45,7 @@ #include <settings.h> #include <utils.h> #include <globals.h> +#include <constants.h> #include <runoncechecker.h> #include <filedownloaderfactory.h> diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index 653f641bb..04c1c5016 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -102,7 +102,6 @@ HEADERS += \ sdkapp.h \ updatechecker.h \ installerbase.h \ - constants.h \ commandlineparser.h SOURCES = \ |