Utils: Compile winutils on all platform

... and simplify "user" code.

Change-Id: I2dfa402f25ab83f1ab80adc0ac508e8383c69641
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2014-02-19 15:35:58 +01:00
committed by David Schulz
parent c2015ea3dc
commit 97d98c96e5
14 changed files with 36 additions and 63 deletions

View File

@@ -106,9 +106,7 @@
#include <utils/styledbar.h>
#include <utils/proxyaction.h>
#include <utils/statuslabel.h>
#ifdef Q_OS_WIN
# include <utils/winutils.h>
#endif
#include <utils/winutils.h>
#include <QComboBox>
#include <QDockWidget>
@@ -588,13 +586,11 @@ public:
// On a 64bit OS, prefer a 64bit debugger.
static Kit *findUniversalCdbKit()
{
#ifdef Q_OS_WIN
if (Utils::winIs64BitSystem()) {
if (Utils::is64BitWindowsSystem()) {
CdbMatcher matcher64(64);
if (Kit *cdb64Kit = KitManager::find(matcher64))
return cdb64Kit;
}
#endif
CdbMatcher matcher;
return KitManager::find(matcher);
}