Merge topic 'qtdialog-lib-paths'

48624b3c cmake-gui: Do not remove library paths for Qt5 plugins.
This commit is contained in:
Brad King 2016-09-23 08:39:56 -04:00 committed by CMake Topic Stage
commit 785f875426

View File

@ -109,11 +109,13 @@ int main(int argc, char** argv)
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());