commit 967e9aafda9054a3e963923d14514075225f7792
author Brad King <brad.king@kitware.com> Wed Nov 02 11:45:37 2016 -0400
committer Brad King <brad.king@kitware.com> Wed Nov 02 11:45:37 2016 -0400
tree a62ce21e265dad6bc0b92688a590290932797ac1
parent de25d988bccc2d81ce137d763246aadafda336ea
parent ff3ccc1f2315d3de91ee6a90c8754ea554965c1d

Merge branch 'FindHDF5-restore-default-C' into release-3.6

Source/QtDialog/CMakeSetup.cxx

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index c849d52..61c4d7b 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -101,11 +101,13 @@
   QTextCodec::setCodecForLocale(utf8_codec);
 #endif
 
+#if QT_VERSION < 0x050000
   // clean out standard Qt paths for plugins, which we don't use anyway
   // when creating Mac bundles, it potentially causes problems
   foreach (QString p, QApplication::libraryPaths()) {
     QApplication::removeLibraryPath(p);
   }
+#endif
 
   // tell the cmake library where cmake is
   QDir cmExecDir(QApplication::applicationDirPath());