[vidalia-svn] r3582: If we're building on Windows with Marble support, add plugin (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-02-23 23:55:38 -0500 (Mon, 23 Feb 2009)
New Revision: 3582

Modified:
   vidalia/trunk/src/vidalia/main.cpp
Log:

If we're building on Windows with Marble support, add plugins/qt to the
library search path so Qt can find its JPEG plugin at runtime.


Modified: vidalia/trunk/src/vidalia/main.cpp
===================================================================
--- vidalia/trunk/src/vidalia/main.cpp	2009-02-24 04:43:40 UTC (rev 3581)
+++ vidalia/trunk/src/vidalia/main.cpp	2009-02-24 04:55:38 UTC (rev 3582)
@@ -20,6 +20,7 @@
 #include <vmessagebox.h>
 #include <procutil.h>
 #include <stringutil.h>
+#include <config.h>
 
 #if defined(Q_OS_WIN32)
 #include <QSysInfo>
@@ -62,6 +63,10 @@
   vNotice("Vidalia %1 using Qt %2").arg(Vidalia::version())
                                    .arg(QT_VERSION_STR);
 
+#if defined(USE_MARBLE) && defined(Q_OS_WIN32)
+  vApp->addLibraryPath(vApp->applicationDirPath() + "/plugins/qt");
+#endif
+
   /* Validate any command-line arguments, or show usage message box, if
    * necessary. */
   QString errmsg;