diff options
| author | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-06-21 11:51:10 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-06-21 12:32:42 +0300 |
| commit | e87c58548ae1e412491210e1951a2527ac0ff381 (patch) | |
| tree | ca5efe41f021f431873318b66daa859d1021b7aa /src/libs/kdtools | |
| parent | 76fd6e8f2953347ea0bf7a57b643968784bc9acc (diff) | |
| parent | 6a06b8adc5d6fabac4401219044b928043e7e8a9 (diff) | |
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
Diffstat (limited to 'src/libs/kdtools')
| -rw-r--r-- | src/libs/kdtools/sysinfo_x11.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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 |