build: fixes to build on linux
* dont use Q_PROCESSOR macros for 32/64 getArchitectureType
move the function from lib_gui to lib
* added missing include
This commit is contained in:
@@ -7,6 +7,7 @@
|
||||
#include "utility/ResourcePaths.h"
|
||||
#include "utility/utilityPathDetection.h"
|
||||
#include "utility/utilityApp.h"
|
||||
#include "utility/utility.h"
|
||||
|
||||
QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
|
||||
QtProjectWizzardWindow* window
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include "utility/file/FilePath.h"
|
||||
#include "utility/utilityApp.h"
|
||||
#include "utility/utility.h"
|
||||
|
||||
JavaPathDetectorWindows::JavaPathDetectorWindows(const std::string javaVersion)
|
||||
: JavaPathDetector("Java " + javaVersion + " for Windows", javaVersion)
|
||||
|
||||
@@ -78,18 +78,6 @@ void utility::killRunningProcesses()
|
||||
}
|
||||
}
|
||||
|
||||
ApplicationArchitectureType utility::getApplicationArchitectureType()
|
||||
{
|
||||
#ifdef Q_PROCESSOR_X86_64
|
||||
return APPLICATION_ARCHITECTURE_X86_64;
|
||||
#endif
|
||||
|
||||
#ifdef Q_PROCESSOR_X86_32
|
||||
return APPLICATION_ARCHITECTURE_X86_32;
|
||||
#endif
|
||||
return APPLICATION_ARCHITECTURE_UNKNOWN;
|
||||
}
|
||||
|
||||
int utility::getIdealThreadCount()
|
||||
{
|
||||
return QThread::idealThreadCount();
|
||||
|
||||
@@ -14,8 +14,6 @@ namespace utility
|
||||
|
||||
void killRunningProcesses();
|
||||
|
||||
ApplicationArchitectureType getApplicationArchitectureType();
|
||||
|
||||
int getIdealThreadCount();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user