Merge remote-tracking branch 'origin/2.0' into 3.0

Conflicts:
	src/libs/installer/downloadfiletask.cpp
	src/sdk/translations/ru.ts

Change-Id: Ibce8b9592c98cec5af3521f4ae6f850c2b8f45ac

13 files changed, 19 insertions, 1 deletions

diff --git a/src/libs/installer/consumeoutputoperation.h b/src/libs/installer/consumeoutputoperation.h
index 714fe51ee..a1f8a09ff 100644
--- a/src/libs/installer/consumeoutputoperation.h
+++ b/src/libs/installer/consumeoutputoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT ConsumeOutputOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::ConsumeOutputOperation)
 public:
     explicit ConsumeOutputOperation(PackageManagerCore *core);
 
diff --git a/src/libs/installer/createdesktopentryoperation.h b/src/libs/installer/createdesktopentryoperation.h
index 2744172f0..793d1db16 100644
--- a/src/libs/installer/createdesktopentryoperation.h
+++ b/src/libs/installer/createdesktopentryoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT CreateDesktopEntryOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::CreateDesktopEntryOperation)
 public:
     explicit CreateDesktopEntryOperation(PackageManagerCore *core);
     ~CreateDesktopEntryOperation();
diff --git a/src/libs/installer/createlinkoperation.h b/src/libs/installer/createlinkoperation.h
index 22a2a1f7a..2e4ece9aa 100644
--- a/src/libs/installer/createlinkoperation.h
+++ b/src/libs/installer/createlinkoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT CreateLinkOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::CreateLinkOperation)
 public:
     explicit CreateLinkOperation(PackageManagerCore *core);
 
diff --git a/src/libs/installer/createshortcutoperation.h b/src/libs/installer/createshortcutoperation.h
index 84aec10df..dc2ac6ddb 100644
--- a/src/libs/installer/createshortcutoperation.h
+++ b/src/libs/installer/createshortcutoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT CreateShortcutOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::CreateShortcutOperation)
 public:
     explicit CreateShortcutOperation(PackageManagerCore *core);
 
diff --git a/src/libs/installer/downloadfiletask.cpp b/src/libs/installer/downloadfiletask.cpp
index c6cef2183..2c99e04e1 100644
--- a/src/libs/installer/downloadfiletask.cpp
+++ b/src/libs/installer/downloadfiletask.cpp
@@ -257,6 +257,7 @@ void Downloader::onError(QNetworkReply::NetworkError error)
         const Data &data = *m_downloads[reply];
         //Do not throw error if Updates.xml not found. The repository might be removed
         //with RepositoryUpdate in Updates.xml later.
+        //: %2 is a sentence describing the error
         if (data.taskItem.source().contains(QLatin1String("Updates.xml"), Qt::CaseInsensitive)) {
             qDebug() << QString::fromLatin1("Network error while downloading '%1': %2.").arg(
                    data.taskItem.source(), reply->errorString());
@@ -265,7 +266,6 @@ void Downloader::onError(QNetworkReply::NetworkError error)
                 TaskException(tr("Network error while downloading '%1': %2.").arg(
                                       data.taskItem.source(), reply->errorString())));
         }
-        //: %2 is a sentence describing the error
     } else {
         //: %1 is a sentence describing the error
         m_futureInterface->reportException(
diff --git a/src/libs/installer/environmentvariablesoperation.h b/src/libs/installer/environmentvariablesoperation.h
index 1f4ad4cb2..3c5252bc6 100644
--- a/src/libs/installer/environmentvariablesoperation.h
+++ b/src/libs/installer/environmentvariablesoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT EnvironmentVariableOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::EnvironmentVariableOperation)
 public:
     explicit EnvironmentVariableOperation(PackageManagerCore *core);
 
diff --git a/src/libs/installer/globalsettingsoperation.h b/src/libs/installer/globalsettingsoperation.h
index 67d416ecf..fe5d14edb 100644
--- a/src/libs/installer/globalsettingsoperation.h
+++ b/src/libs/installer/globalsettingsoperation.h
@@ -36,6 +36,7 @@ namespace QInstaller {
 class QSettingsWrapper;
 class INSTALLER_EXPORT GlobalSettingsOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::GlobalSettingsOperation)
 public:
     explicit GlobalSettingsOperation(PackageManagerCore *core);
 
diff --git a/src/libs/installer/licenseoperation.h b/src/libs/installer/licenseoperation.h
index 06e3fa777..49b885565 100644
--- a/src/libs/installer/licenseoperation.h
+++ b/src/libs/installer/licenseoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT LicenseOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::LicenseOperation)
 public:
     explicit LicenseOperation(PackageManagerCore *core);
 
diff --git a/src/libs/installer/linereplaceoperation.h b/src/libs/installer/linereplaceoperation.h
index 8e310fe84..d15e11fef 100644
--- a/src/libs/installer/linereplaceoperation.h
+++ b/src/libs/installer/linereplaceoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT LineReplaceOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::LineReplaceOperation)
 public:
     explicit LineReplaceOperation(PackageManagerCore *core);
 
diff --git a/src/libs/installer/replaceoperation.h b/src/libs/installer/replaceoperation.h
index ca81db47c..0d2783ab6 100644
--- a/src/libs/installer/replaceoperation.h
+++ b/src/libs/installer/replaceoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT ReplaceOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::ReplaceOperation)
 public:
     explicit ReplaceOperation(PackageManagerCore *core);
 
diff --git a/src/libs/installer/selfrestartoperation.h b/src/libs/installer/selfrestartoperation.h
index 9acd46490..7adccd183 100644
--- a/src/libs/installer/selfrestartoperation.h
+++ b/src/libs/installer/selfrestartoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT SelfRestartOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::SelfRestartOperation)
 public:
     explicit SelfRestartOperation(PackageManagerCore *core);
 
diff --git a/src/libs/installer/settingsoperation.h b/src/libs/installer/settingsoperation.h
index b8d02589e..0b94ea015 100644
--- a/src/libs/installer/settingsoperation.h
+++ b/src/libs/installer/settingsoperation.h
@@ -35,6 +35,7 @@ namespace QInstaller {
 
 class INSTALLER_EXPORT SettingsOperation : public Operation
 {
+    Q_DECLARE_TR_FUNCTIONS(QInstaller::SettingsOperation)
 public:
     explicit SettingsOperation(PackageManagerCore *core);
 
diff --git a/src/libs/kdtools/updateoperations.h b/src/libs/kdtools/updateoperations.h
index cb8b133e6..b13a42559 100644
--- a/src/libs/kdtools/updateoperations.h
+++ b/src/libs/kdtools/updateoperations.h
@@ -35,6 +35,7 @@ namespace KDUpdater {
 
 class KDTOOLS_EXPORT CopyOperation : public UpdateOperation
 {
+    Q_DECLARE_TR_FUNCTIONS(KDUpdater::CopyOperation)
 public:
     explicit CopyOperation(QInstaller::PackageManagerCore *core = 0);
     ~CopyOperation();
@@ -52,6 +53,7 @@ private:
 
 class KDTOOLS_EXPORT MoveOperation : public UpdateOperation
 {
+    Q_DECLARE_TR_FUNCTIONS(KDUpdater::MoveOperation)
 public:
     explicit MoveOperation(QInstaller::PackageManagerCore *core = 0);
     ~MoveOperation();
@@ -64,6 +66,7 @@ public:
 
 class KDTOOLS_EXPORT DeleteOperation : public UpdateOperation
 {
+    Q_DECLARE_TR_FUNCTIONS(KDUpdater::DeleteOperation)
 public:
     explicit DeleteOperation(QInstaller::PackageManagerCore *core = 0);
     ~DeleteOperation();
@@ -78,6 +81,7 @@ public:
 
 class KDTOOLS_EXPORT MkdirOperation : public UpdateOperation
 {
+    Q_DECLARE_TR_FUNCTIONS(KDUpdater::MkdirOperation)
 public:
     explicit MkdirOperation(QInstaller::PackageManagerCore *core = 0);
 
@@ -89,6 +93,7 @@ public:
 
 class KDTOOLS_EXPORT RmdirOperation : public UpdateOperation
 {
+    Q_DECLARE_TR_FUNCTIONS(KDUpdater::RmdirOperation)
 public:
     RmdirOperation(QInstaller::PackageManagerCore *core = 0);
 
@@ -100,6 +105,7 @@ public:
 
 class KDTOOLS_EXPORT AppendFileOperation : public UpdateOperation
 {
+    Q_DECLARE_TR_FUNCTIONS(KDUpdater::AppendFileOperation)
 public:
     explicit AppendFileOperation(QInstaller::PackageManagerCore *core = 0);
 
@@ -111,6 +117,7 @@ public:
 
 class KDTOOLS_EXPORT PrependFileOperation : public UpdateOperation
 {
+    Q_DECLARE_TR_FUNCTIONS(KDUpdater::PrependFileOperation)
 public:
     explicit PrependFileOperation(QInstaller::PackageManagerCore *core = 0);