From 2e98f0c965cb3ad80119fb4415593cb4bf10c2a6 Mon Sep 17 00:00:00 2001 From: skyjake Date: Sun, 28 Oct 2012 15:39:52 +0200 Subject: [PATCH] Mac OS X: Attempting to fix a plugin loading failure with Qt 4.7 It seems that Qt 4.6 and 4.7 can't load libraries automatically from within bundles? Let's see if this helps at all... --- doomsday/libdeng2/src/core/library.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doomsday/libdeng2/src/core/library.cpp b/doomsday/libdeng2/src/core/library.cpp index 11e5c2b01a..daa5c01399 100644 --- a/doomsday/libdeng2/src/core/library.cpp +++ b/doomsday/libdeng2/src/core/library.cpp @@ -29,19 +29,20 @@ Library::Library(const String& nativePath) { LOG_AS("Library::Library"); + /* #ifdef MACOSX // If the library happens to be in a bundle, just use the bundle path. String path = nativePath; if(path.fileNamePath().fileNameExtension() == ".bundle") { - path = path.fileNamePath(); + path = path; //.fileNamePath().fileNameWithoutExtension(); } LOG_TRACE("%s") << path; _library = new QLibrary(path); -#else +#else*/ LOG_TRACE("%s") << nativePath; _library = new QLibrary(nativePath); -#endif +//#endif _library->setLoadHints(QLibrary::ResolveAllSymbolsHint); _library->load();