diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-23 12:39:56 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-23 12:39:56 (GMT) |
| commit | 785f875426ec7aebb6583419515bf4e4c3975464 (patch) | |
| tree | 8e43a874daa7a3259739ac8463b643908a09d6c5 /Source/QtDialog | |
| parent | d0a27ae998e5ff313937f346b53d672c6353bd74 (diff) | |
| parent | 48624b3cb85a6e1854eff0ef45996ef75b5aa9e9 (diff) | |
| download | CMake-785f875426ec7aebb6583419515bf4e4c3975464.zip CMake-785f875426ec7aebb6583419515bf4e4c3975464.tar.gz CMake-785f875426ec7aebb6583419515bf4e4c3975464.tar.bz2 | |
Merge topic 'qtdialog-lib-paths'
48624b3c cmake-gui: Do not remove library paths for Qt5 plugins.
Diffstat (limited to 'Source/QtDialog')
| -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 4de4bef..52809b0 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -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()); |