summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2016-09-22 19:13:38 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2016-09-22 19:19:04 (GMT)
commit48624b3cb85a6e1854eff0ef45996ef75b5aa9e9 (patch)
tree6c172908f50d1ddac3e219c6134424d111ea273b /Source/QtDialog
parentc5dcd31e92c0a09009a340e3fe23ced4f6190b64 (diff)
downloadCMake-48624b3cb85a6e1854eff0ef45996ef75b5aa9e9.zip
CMake-48624b3cb85a6e1854eff0ef45996ef75b5aa9e9.tar.gz
CMake-48624b3cb85a6e1854eff0ef45996ef75b5aa9e9.tar.bz2
cmake-gui: Do not remove library paths for Qt5 plugins.
Not removing library paths is necessary for QFileDialog to function correctly on Linux when using Qt5.
Diffstat (limited to 'Source/QtDialog')
-rw-r--r--Source/QtDialog/CMakeSetup.cxx2
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());