Browse Source

Merge topic 'qtdialog-lib-paths'

48624b3c cmake-gui: Do not remove library paths for Qt5 plugins.
Brad King 9 years ago
parent
commit
785f875426
1 changed files with 2 additions and 0 deletions
  1. 2 0
      Source/QtDialog/CMakeSetup.cxx

+ 2 - 0
Source/QtDialog/CMakeSetup.cxx

@@ -109,11 +109,13 @@ int main(int argc, char** argv)
   QTextCodec::setCodecForLocale(utf8_codec);
   QTextCodec::setCodecForLocale(utf8_codec);
 #endif
 #endif
 
 
+#if QT_VERSION < 0x050000
   // clean out standard Qt paths for plugins, which we don't use anyway
   // clean out standard Qt paths for plugins, which we don't use anyway
   // when creating Mac bundles, it potentially causes problems
   // when creating Mac bundles, it potentially causes problems
   foreach (QString p, QApplication::libraryPaths()) {
   foreach (QString p, QApplication::libraryPaths()) {
     QApplication::removeLibraryPath(p);
     QApplication::removeLibraryPath(p);
   }
   }
+#endif
 
 
   // tell the cmake library where cmake is
   // tell the cmake library where cmake is
   QDir cmExecDir(QApplication::applicationDirPath());
   QDir cmExecDir(QApplication::applicationDirPath());