Skip to content
Snippets Groups Projects
Commit dfaca0e9 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Qt4ProjectManager: Remove unneeded #ifdefs.


Get host OS info at runtime.

Change-Id: I677fb093fefef7fbe341c972b828df5d81a04ef4
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
parent a4cfb139
No related branches found
No related tags found
No related merge requests found
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "qt4project.h" #include "qt4project.h"
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include <utils/hostosinfo.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
...@@ -75,9 +76,15 @@ static inline QString msgAppNotFound(const QString &id) ...@@ -75,9 +76,15 @@ static inline QString msgAppNotFound(const QString &id)
} }
// -- Commands and helpers // -- Commands and helpers
#ifdef Q_OS_MAC static QString linguistBinary()
static const char linguistBinaryC[] = "Linguist"; {
static const char designerBinaryC[] = "Designer"; return QLatin1String(Utils::HostOsInfo::isMacHost() ? "Linguist" : "linguist");
}
static QString designerBinary()
{
return QLatin1String(Utils::HostOsInfo::isMacHost() ? "Designer" : "designer");
}
// Mac: Change the call 'Foo.app/Contents/MacOS/Foo <filelist>' to // Mac: Change the call 'Foo.app/Contents/MacOS/Foo <filelist>' to
// 'open -a Foo.app <filelist>'. doesn't support generic command line arguments // 'open -a Foo.app <filelist>'. doesn't support generic command line arguments
...@@ -91,10 +98,6 @@ static void createMacOpenCommand(QString *binary, QStringList *arguments) ...@@ -91,10 +98,6 @@ static void createMacOpenCommand(QString *binary, QStringList *arguments)
*binary = QLatin1String("open"); *binary = QLatin1String("open");
} }
} }
#else
static const char linguistBinaryC[] = "linguist";
static const char designerBinaryC[] = "designer";
#endif
static const char designerIdC[] = "Qt.Designer"; static const char designerIdC[] = "Qt.Designer";
static const char linguistIdC[] = "Qt.Linguist"; static const char linguistIdC[] = "Qt.Linguist";
...@@ -193,8 +196,7 @@ bool LinguistExternalEditor::startEditor(const QString &fileName, QString *error ...@@ -193,8 +196,7 @@ bool LinguistExternalEditor::startEditor(const QString &fileName, QString *error
{ {
EditorLaunchData data; EditorLaunchData data;
return getEditorLaunchData(fileName, &QtSupport::BaseQtVersion::linguistCommand, return getEditorLaunchData(fileName, &QtSupport::BaseQtVersion::linguistCommand,
QLatin1String(linguistBinaryC), linguistBinary(), QStringList(), true, &data, errorMessage)
QStringList(), true, &data, errorMessage)
&& startEditorProcess(data, errorMessage); && startEditorProcess(data, errorMessage);
} }
...@@ -211,8 +213,7 @@ bool MacDesignerExternalEditor::startEditor(const QString &fileName, QString *er ...@@ -211,8 +213,7 @@ bool MacDesignerExternalEditor::startEditor(const QString &fileName, QString *er
{ {
EditorLaunchData data; EditorLaunchData data;
return getEditorLaunchData(fileName, &QtSupport::BaseQtVersion::designerCommand, return getEditorLaunchData(fileName, &QtSupport::BaseQtVersion::designerCommand,
QLatin1String(designerBinaryC), designerBinary(), QStringList(), true, &data, errorMessage)
QStringList(), true, &data, errorMessage)
&& startEditorProcess(data, errorMessage); && startEditorProcess(data, errorMessage);
return false; return false;
} }
...@@ -247,8 +248,7 @@ bool DesignerExternalEditor::startEditor(const QString &fileName, QString *error ...@@ -247,8 +248,7 @@ bool DesignerExternalEditor::startEditor(const QString &fileName, QString *error
EditorLaunchData data; EditorLaunchData data;
// Find the editor binary // Find the editor binary
if (!getEditorLaunchData(fileName, &QtSupport::BaseQtVersion::designerCommand, if (!getEditorLaunchData(fileName, &QtSupport::BaseQtVersion::designerCommand,
QLatin1String(designerBinaryC), designerBinary(), QStringList(), false, &data, errorMessage)) {
QStringList(), false, &data, errorMessage)) {
return false; return false;
} }
// Known one? // Known one?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment