kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
parent d0a27ae998 48624b3cb8
commit 785f875426
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/QtDialog/CMakeSetup.cxx
View File

@ -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());