Merge remote-tracking branch 'origin/4.10' into devHEADdev

Change-Id: Iae31477611f55716777f1e3e51b613bf1c260ca1

2 files changed, 10 insertions, 0 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 8bcbd3ba8..38fd6d822 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -641,6 +641,15 @@ QStringList PackageManagerCore::givenArguments() const
 {
     return m_arguments;
 }
+
+/*!
+    Returns \c true if installation is hybrid.
+    \sa createOfflineInstaller()
+*/
+bool PackageManagerCore::isHybridInstaller() const
+{
+    return d->isHybridInstaller();
+}
 /*!
     \deprecated [4.5] Use recalculateAllComponents() instead.
 
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index 2c89f412a..8e8717711 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -407,6 +407,7 @@ public:
 
     void saveGivenArguments(const QStringList &args);
     QStringList givenArguments() const;
+    bool isHybridInstaller() const;
 
 public Q_SLOTS:
     bool runInstaller();