diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-02 15:45:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-02 15:45:33 (GMT) |
| commit | de25d988bccc2d81ce137d763246aadafda336ea (patch) | |
| tree | 6c172908f50d1ddac3e219c6134424d111ea273b | |
| parent | c5dcd31e92c0a09009a340e3fe23ced4f6190b64 (diff) | |
| parent | 48624b3cb85a6e1854eff0ef45996ef75b5aa9e9 (diff) | |
| download | CMake-de25d988bccc2d81ce137d763246aadafda336ea.zip CMake-de25d988bccc2d81ce137d763246aadafda336ea.tar.gz CMake-de25d988bccc2d81ce137d763246aadafda336ea.tar.bz2 | |
Merge branch 'qtdialog-lib-paths' into release-3.6
| -rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ 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()); |