Qt: Fix library path reset.

g9a3676a reset the Qt library path *after* wsApp was instantiated, which
is too late. Do so before QCoreApplication has a chance to do anything
we might regret.

Change-Id: Ibbdb69d1b7c0ea4bf1042e98a5bb5deba13e954e
Reviewed-on: https://code.wireshark.org/review/6864
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 0 insertions, 25 deletions

diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 677485ba0a..4288d26a89 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -479,31 +479,6 @@ WiresharkApplication::WiresharkApplication(int &argc,  char **argv) :
     wsApp = this;
     setApplicationName("Wireshark");
 
-#ifdef Q_OS_WIN
-    // Try to avoid library search path collisions. QCoreApplication will
-    // search QT_INSTALL_PREFIX/plugins for platform DLLs before searching
-    // the application directory. If
-    //
-    // - You have Qt version 5.x.y installed in the default location
-    //   (C:\Qt\5.x) on your machine.
-    //
-    // and
-    //
-    // - You install Wireshark that was built on a machine with Qt version
-    //   5.x.z installed in the default location.
-    //
-    // Qt5Core.dll will load qwindows.dll from your local C:\Qt\...\plugins
-    // directory. This may not be compatible with qwindows.dll from that
-    // same path on the build machine. We work around this by removing every
-    // except our application directory.
-
-    foreach (QString path, libraryPaths()) {
-        if (path.compare(applicationDirPath())) {
-            removeLibraryPath(path);
-        }
-    }
-#endif
-
     Q_INIT_RESOURCE(about);
     Q_INIT_RESOURCE(display_filter);
     Q_INIT_RESOURCE(i18n);