This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3bb5115ac5b7a0b2179ef0d890783b67f285d312 (commit)
via 48624b3cb85a6e1854eff0ef45996ef75b5aa9e9 (commit)
from 37c31ff4b4ee7576e6e93d86ca79ceeb537a9f1d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bb5115ac5b7a0b2179ef0d890783b67f285d312
commit 3bb5115ac5b7a0b2179ef0d890783b67f285d312
Merge: 37c31ff 48624b3
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Sep 22 15:20:31 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 22 15:20:31 2016 -0400
Merge topic 'qtdialog-lib-paths' into next
48624b3c cmake-gui: Do not remove library paths for Qt5 plugins.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48624b3cb85a6e1854eff0ef45996ef75b5aa9e9
commit 48624b3cb85a6e1854eff0ef45996ef75b5aa9e9
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Sep 22 13:13:38 2016 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Thu Sep 22 13:19:04 2016 -0600
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.
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());
-----------------------------------------------------------------------
Summary of changes:
Source/QtDialog/CMakeSetup.cxx | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
