From 5cd87e92a4d47b2f2f56aa125d10835a764a46e1 Mon Sep 17 00:00:00 2001 From: "Jerry (Xinyu Hou)" Date: Wed, 8 Jul 2015 15:00:22 -0700 Subject: [PATCH] Revert "Fixed name for Mac and Linux Build #4696" This reverts commit e35fd80cef47fd7faf25030366d3326b4a31ac54. --- src/gui/src/Plugin.cpp | 4 ++-- src/gui/src/PluginManager.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui/src/Plugin.cpp b/src/gui/src/Plugin.cpp index 4c1729fbb8..4759e4e2dc 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 + getOsSpecificExt(); + result = kMacPluginPrefix + pluginName + getPluginOsSpecificExt(); #else - result = kLinuxPluginPrefix + pluginName + getOsSpecificExt(); + result = kLinuxPluginPrefix + pluginName + getPluginOsSpecificExt(); #endif return result; } diff --git a/src/gui/src/PluginManager.cpp b/src/gui/src/PluginManager.cpp index 371194a2ed..e73c93e687 100644 --- a/src/gui/src/PluginManager.cpp +++ b/src/gui/src/PluginManager.cpp @@ -101,10 +101,8 @@ 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