Merge remote-tracking branch 'origin/2.0'

Conflicts:
	Changelog
	dist/config/config.xml
	dist/packages/org.qtproject.ifw.binaries/meta/package.xml
	dist/packages/org.qtproject.ifw/meta/package.xml
	installerfw.pri
	src/libs/7zip/7zip.pro
	src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp
	src/libs/installer/component.cpp
	src/libs/installer/lib7z_facade.cpp
	src/libs/installer/packagemanagercore.cpp
	src/libs/installer/proxycredentialsdialog.h
	src/sdk/translations/ja.ts
	tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
	tests/auto/installer/scriptengine/tst_scriptengine.cpp
	tests/auto/installer/settings/tst_settings.cpp

Change-Id: I3bb98b8490b3c3eb7f664c1abb7417155b5430b2

6 files changed, 42 insertions, 38 deletions

diff --git a/src/libs/7zip/7zip.pro b/src/libs/7zip/7zip.pro
index 70a51c068..17e64df8f 100644
--- a/src/libs/7zip/7zip.pro
+++ b/src/libs/7zip/7zip.pro
@@ -9,3 +9,6 @@ DESTDIR = $$IFW_LIB_PATH
 include(7zip.pri)
 win32:include($$7ZIP_BASE/win.pri) #7zip
 unix:include($$7ZIP_BASE/unix.pri) #p7zip
+
+target.path = $$[QT_INSTALL_LIBS]
+INSTALLS += target
diff --git a/src/libs/installer/adminauthorization_x11.cpp b/src/libs/installer/adminauthorization_x11.cpp
index 7c546c0f2..673c96a4b 100644
--- a/src/libs/installer/adminauthorization_x11.cpp
+++ b/src/libs/installer/adminauthorization_x11.cpp
@@ -49,9 +49,13 @@
 #include <linux/limits.h>
 #include <pty.h>
 #else
+#ifdef Q_OS_FREEBSD
+#include <libutil.h>
+#include <signal.h>
+#else
 #include <util.h>
 #endif
-
+#endif
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp
index 3f3cdbb2a..901bf7f9e 100644
--- a/src/libs/installer/elevatedexecuteoperation.cpp
+++ b/src/libs/installer/elevatedexecuteoperation.cpp
@@ -170,16 +170,7 @@ bool ElevatedExecuteOperation::Private::run(const QStringList &arguments)
     }
     //readProcessOutput should only called from this current Thread -> Qt::DirectConnection
     QObject::connect(process, SIGNAL(readyRead()), q, SLOT(readProcessOutput()), Qt::DirectConnection);
-#ifdef Q_OS_WIN
-    if (args.count() == 1) {
-        process->setNativeArguments(args.front());
-        qDebug() << "ElevatedExecuteOperation setNativeArguments to start:" << args.front();
-        process->start(QString(), QStringList());
-    } else
-#endif
-    {
-        process->start(args.front(), args.mid(1));
-    }
+    process->start(args.front(), args.mid(1));
     qDebug() << args.front() << "started, arguments:" << QStringList(args.mid(1)).join(QLatin1String(" "));
 
     bool success = false;
diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro
index 9447108ee..d641ff1fc 100644
--- a/src/libs/installer/installer.pro
+++ b/src/libs/installer/installer.pro
@@ -227,3 +227,6 @@ win32 {
     win32-g++*:LIBS += -lmpr -luuid
     win32-g++*:QMAKE_CXXFLAGS += -Wno-missing-field-initializers
 }
+
+target.path = $$[QT_INSTALL_LIBS]
+INSTALLS += target
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 492920efc..731171f61 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -1426,34 +1426,28 @@ void PackageManagerCore::appendRootComponent(Component *component)
 }
 
 /*!
-    \class PackageManagerCore::ComponentType
-    \inmodule QtInstallerFramework
-    \brief The ComponentType class describes a component list.
-
-    This class is used with the components() function to describe what type of \c Component
-    list it should return.
-
-    \list
-        \li \c Root returns a list of root components.
-
-        \li \c Descendants returns a list of all descendant components.
-
-            \note In updater mode the list is empty, because component updates cannot have children.
-
-        \li \c Dependencies returns a list of all available dependencies when run as updater.
-
-            \note When running as installer, package manager, or uninstaller, this will always
-            result in an empty list.
-
-        \li \c Replacements returns a list of all available replacement components relevant to the
-            run mode.
-
-        \li \c AllNoReplacements returns a list of available components, including root, descendant,
+    \enum PackageManagerCore::ComponentType
+    \brief This enum holds the type of the component list to be returned:
+
+    \value  Root
+            Returns a list of root components.
+    \value  Descendants
+            Returns a list of all descendant components. In updater mode the
+            list is empty, because component updates cannot have children.
+    \value  Dependencies
+            Returns a list of all available dependencies when run as updater.
+            When running as installer, package manager, or uninstaller, this
+            will always result in an empty list.
+    \value  Replacements
+            Returns a list of all available replacement components relevant to
+            the run mode.
+    \value  AllNoReplacements
+            Returns a list of available components, including root, descendant,
             and dependency components relevant to the run mode.
-
-        \li \c All returns a list of all available components, including root, descendant,
-            dependency, and replacement components relevant to the run mode.
-    \endlist
+    \value  All
+            Returns a list of all available components, including root,
+            descendant, dependency, and replacement components relevant to the
+            run mode.
 */
 
 /*!
diff --git a/src/libs/kdtools/sysinfo_x11.cpp b/src/libs/kdtools/sysinfo_x11.cpp
index 6fddf895f..9a7909f24 100644
--- a/src/libs/kdtools/sysinfo_x11.cpp
+++ b/src/libs/kdtools/sysinfo_x11.cpp
@@ -36,6 +36,11 @@
 #include <sys/utsname.h>
 #include <sys/statvfs.h>
 
+#ifdef Q_OS_FREEBSD
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 #include <QtCore/QDir>
@@ -62,7 +67,11 @@ quint64 installedMemory()
 #else
     quint64 physmem;
     size_t len = sizeof physmem;
+#ifdef Q_OS_FREEBSD
+    static int mib[2] = { CTL_HW, HW_PHYSMEM };
+#else
     static int mib[2] = { CTL_HW, HW_MEMSIZE };
+#endif
     sysctl(mib, 2, &physmem, &len, 0, 0);
     return quint64(physmem);
 #endif