diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/adminauthorization_x11.cpp | 1 | ||||
-rw-r--r-- | src/libs/installer/binaryformatengine.cpp | 2 | ||||
-rw-r--r-- | src/libs/installer/component.cpp | 1 | ||||
-rw-r--r-- | src/libs/installer/downloadfiletask.cpp | 13 | ||||
-rw-r--r-- | src/libs/installer/elevatedexecuteoperation.cpp | 5 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 1 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercoredata.cpp | 1 | ||||
-rw-r--r-- | src/libs/installer/remotefileengine.cpp | 2 | ||||
-rw-r--r-- | src/libs/kdtools/sysinfo_x11.cpp | 1 | ||||
-rw-r--r-- | src/libs/kdtools/updatefinder.cpp | 1 |
10 files changed, 23 insertions, 5 deletions
diff --git a/src/libs/installer/adminauthorization_x11.cpp b/src/libs/installer/adminauthorization_x11.cpp index aa5e1d91d..7068bb2c6 100644 --- a/src/libs/installer/adminauthorization_x11.cpp +++ b/src/libs/installer/adminauthorization_x11.cpp @@ -29,6 +29,7 @@ #include "adminauthorization.h" #include <QtCore/QFile> +#include <QtCore/QRegExp> #include <QDebug> #include <QApplication> diff --git a/src/libs/installer/binaryformatengine.cpp b/src/libs/installer/binaryformatengine.cpp index 20fd6e3f2..1100bcf08 100644 --- a/src/libs/installer/binaryformatengine.cpp +++ b/src/libs/installer/binaryformatengine.cpp @@ -28,6 +28,8 @@ #include "binaryformatengine.h" +#include <QRegExp> + namespace { class StringListIterator : public QAbstractFileEngineIterator diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index d74b7ce7e..da0230ade 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -43,6 +43,7 @@ #include <productkeycheck.h> #include <QtCore/QDirIterator> +#include <QtCore/QRegExp> #include <QtCore/QTranslator> #include <QApplication> diff --git a/src/libs/installer/downloadfiletask.cpp b/src/libs/installer/downloadfiletask.cpp index 200075594..c6cef2183 100644 --- a/src/libs/installer/downloadfiletask.cpp +++ b/src/libs/installer/downloadfiletask.cpp @@ -255,10 +255,17 @@ void Downloader::onError(QNetworkReply::NetworkError error) if (reply) { 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. + 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()); + } else { + m_futureInterface->reportException( + TaskException(tr("Network error while downloading '%1': %2.").arg( + data.taskItem.source(), reply->errorString()))); + } //: %2 is a sentence describing the error - m_futureInterface->reportException( - TaskException(tr("Network error while downloading \"%1\": %2").arg( - data.taskItem.source(), reply->errorString()))); } else { //: %1 is a sentence describing the error m_futureInterface->reportException( diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp index e0f326a33..2cc988a4d 100644 --- a/src/libs/installer/elevatedexecuteoperation.cpp +++ b/src/libs/installer/elevatedexecuteoperation.cpp @@ -31,9 +31,10 @@ #include "environment.h" #include "qprocesswrapper.h" -#include <QtCore/QThread> -#include <QtCore/QProcessEnvironment> #include <QtCore/QDebug> +#include <QtCore/QProcessEnvironment> +#include <QtCore/QRegExp> +#include <QtCore/QThread> using namespace QInstaller; diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 44d95d1ed..edd2460a8 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -54,6 +54,7 @@ #include <QtConcurrentRun> #include <QtCore/QMutex> +#include <QtCore/QRegExp> #include <QtCore/QSettings> #include <QtCore/QTemporaryFile> #include <QtCore/QTextCodec> diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index 6e4fe4f94..3b35794cf 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -34,6 +34,7 @@ #include <QDesktopServices> #include <QDir> +#include <QRegExp> #ifdef Q_OS_WIN # include <windows.h> diff --git a/src/libs/installer/remotefileengine.cpp b/src/libs/installer/remotefileengine.cpp index 305b64729..05f4ec212 100644 --- a/src/libs/installer/remotefileengine.cpp +++ b/src/libs/installer/remotefileengine.cpp @@ -31,6 +31,8 @@ #include "protocol.h" #include "remoteclient.h" +#include <QRegExp> + namespace QInstaller { diff --git a/src/libs/kdtools/sysinfo_x11.cpp b/src/libs/kdtools/sysinfo_x11.cpp index 3c6627791..3099a369a 100644 --- a/src/libs/kdtools/sysinfo_x11.cpp +++ b/src/libs/kdtools/sysinfo_x11.cpp @@ -40,6 +40,7 @@ #include <QtCore/QTextStream> #include <QtCore/QDir> #include <QtCore/QFileInfo> +#include <QtCore/QRegExp> namespace KDUpdater { diff --git a/src/libs/kdtools/updatefinder.cpp b/src/libs/kdtools/updatefinder.cpp index 202bf8cd4..ec1be8a4e 100644 --- a/src/libs/kdtools/updatefinder.cpp +++ b/src/libs/kdtools/updatefinder.cpp @@ -39,6 +39,7 @@ #include <QCoreApplication> #include <QFileInfo> +#include <QRegExp> using namespace KDUpdater; using namespace QInstaller; |