diff options
| author | Simon Rettberg | 2017-07-07 15:41:44 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-07-07 15:41:44 +0200 |
| commit | e55f28e04b471932435c151cbef3e9d4f1daaa2a (patch) | |
| tree | 134e1995cc9513a00f4cdc191840557d378ae619 | |
| parent | [slxbrowser] New module (diff) | |
| download | mltk-e55f28e04b471932435c151cbef3e9d4f1daaa2a.tar.gz mltk-e55f28e04b471932435c151cbef3e9d4f1daaa2a.tar.xz mltk-e55f28e04b471932435c151cbef3e9d4f1daaa2a.zip | |
Fix activate_qt maybe? Do we need this even with cmake?
| -rw-r--r-- | core/includes/qt.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/includes/qt.inc b/core/includes/qt.inc index 9f563c9c..8cc0c1d4 100644 --- a/core/includes/qt.inc +++ b/core/includes/qt.inc @@ -9,8 +9,8 @@ activate_qt() { # Handle qt chooser [ -d "/usr/share/qtchooser" ] || return 0 # No qtchooser found, hope for the best... local QT_DEFAULT="$(readlink -f /usr/share/qtchooser/default.conf)" - if [ -e "$QT_DEFAULT" ]; then - [[ "$(basename "$QT_DEFAULT")" =~ ^qt$QT_VERSION.*\.conf$ ]] || perror "Something with QT4 is bad. Check '/usr/share/qtchooser'" + if [ -e "$QT_DEFAULT" ] && [[ "$(basename "$QT_DEFAULT")" =~ ^qt${QT_VERSION}.*\.conf$ ]]; then + : # Already default else # no default active, try to set it local QT_CANDIDATES="$(find "/usr/share/qtchooser" -name "qt$QT_VERSION*" | grep -E "$ARCHREGEX")" |