From e35fd80cef47fd7faf25030366d3326b4a31ac54 Mon Sep 17 00:00:00 2001 From: Adam Potolsky Date: Fri, 29 May 2015 16:20:47 -0700 Subject: [PATCH] Fixed name for Mac and Linux Build #4696 --- src/gui/src/Plugin.cpp | 4 ++-- src/gui/src/PluginManager.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/src/Plugin.cpp b/src/gui/src/Plugin.cpp index 4759e4e2..4c1729fb 100644 --- a/src/gui/src/Plugin.cpp +++ b/src/gui/src/Plugin.cpp @@ -73,9 +73,9 @@ QString Plugin::getOsSpecificName(const QString& pluginName) #if defined(Q_OS_WIN) result.append(getOsSpecificExt()); #elif defined(Q_OS_MAC) - result = kMacPluginPrefix + pluginName + getPluginOsSpecificExt(); + result = kMacPluginPrefix + pluginName + getOsSpecificExt(); #else - result = kLinuxPluginPrefix + pluginName + getPluginOsSpecificExt(); + result = kLinuxPluginPrefix + pluginName + getOsSpecificExt(); #endif return result; } diff --git a/src/gui/src/PluginManager.cpp b/src/gui/src/PluginManager.cpp index e73c93e6..371194a2 100644 --- a/src/gui/src/PluginManager.cpp +++ b/src/gui/src/PluginManager.cpp @@ -101,8 +101,10 @@ void PluginManager::copyPlugins() QString newName = destDirName; newName.append(QDir::separator()).append(m_FileSysPluginList.at(i)); + // Check to see if the plugin already exists QFile newFile(newName); if(newFile.exists()) { + // If it does, delete it. TODO: Check to see if same and leave newFile.remove(); } // make a copy of the plugin in the new location