From 3ec5060d54e259c419a4d388f1019b40877f74cf Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Sat, 27 Feb 2016 20:16:34 -0500 Subject: [PATCH] Qt - remove hardcoding of app name in build config. Change-Id: Ifccecc9a6b8d0ed8e1bf36e2002a126df29376c3 --- .../src/org/eclipse/cdt/qt/core/QtBuildConfiguration.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtBuildConfiguration.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtBuildConfiguration.java index 5673442bbf4..881400776ef 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtBuildConfiguration.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtBuildConfiguration.java @@ -113,19 +113,20 @@ public class QtBuildConfiguration extends CBuildConfiguration { } public Path getProgramPath() throws CoreException { + String projectName = getProject().getName(); switch (Platform.getOS()) { case Platform.OS_MACOSX: // TODO this is mac local specific and really should be // in the config // TODO also need to pull the app name out of the pro // file name - Path appFolder = getBuildDirectory().resolve("main.app"); + Path appFolder = getBuildDirectory().resolve(projectName + ".app"); Path contentsFolder = appFolder.resolve("Contents"); Path macosFolder = contentsFolder.resolve("MacOS"); - return macosFolder.resolve("main"); + return macosFolder.resolve(projectName); case Platform.OS_WIN32: Path releaseFolder = getBuildDirectory().resolve("release"); - return releaseFolder.resolve("main.exe"); + return releaseFolder.resolve(projectName + ".exe"); default: throw new CoreException( new Status(IStatus.ERROR, Activator.ID, "platform not supported: " + Platform.getOS()));