Removed lib prefix from generators plugin.sb-0.6.0

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>,
          Luciano Wolf <luciano.wolf@openbossa.org>

2 files changed, 6 insertions, 6 deletions

diff --git a/generators/qtdoc/CMakeLists.txt b/generators/qtdoc/CMakeLists.txt
index f943a7cfd..8b2f9e06a 100644
--- a/generators/qtdoc/CMakeLists.txt
+++ b/generators/qtdoc/CMakeLists.txt
@@ -9,6 +9,7 @@ target_link_libraries(docgenerator ${QT_QTCORE_LIBRARY})
 
 add_library(qtdoc_generator SHARED ${qtdoc_generator_SRC})
 target_link_libraries(qtdoc_generator ${APIEXTRACTOR_LIBRARY} ${QT_QTCORE_LIBRARY} genrunner)
+set_property(TARGET qtdoc_generator PROPERTY PREFIX "")
 
 install(TARGETS qtdoc_generator DESTINATION ${generator_plugin_DIR})
 install(TARGETS docgenerator DESTINATION bin)
diff --git a/main.cpp b/main.cpp
index de61112c2..55e658a4a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -116,13 +116,12 @@ int main(int argc, char *argv[])
     // Try to load a generator
     QString generatorSet = args.value("generatorSet");
     if (!generatorSet.isEmpty()) {
-        QString generatorFile;
-        if (generatorSet.contains(QDir::separator()))
-            generatorFile = generatorSet;
-        else
-            generatorFile = QString(GENERATORRUNNER_PLUGIN_DIR) + "/lib" + generatorSet + "_generator";
+        QFileInfo generatorFile(generatorSet);
 
-        QLibrary plugin(generatorFile);
+        if (generatorFile.baseName() == generatorSet)
+            generatorFile.setFile(QDir(GENERATORRUNNER_PLUGIN_DIR), generatorSet + "_generator");
+
+        QLibrary plugin(generatorFile.filePath());
         getGeneratorsFunc getGenerators = (getGeneratorsFunc)plugin.resolve("getGenerators");
         if (getGenerators)
             getGenerators(&generators);