Merge branch 'stable-1.2'

# Conflicts:
#	.travis.yml
#	.travis/linux..script.sh
#	.travis/linux.win32.script.sh
#	.travis/linux.win64.script.sh
#	.travis/osx..install.sh
#	.travis/osx..script.sh
#	data/locale/en.ts
#	data/locale/id.ts
#	include/Graph.h
#	include/VstSyncController.h
#	include/lmms_math.h
#	plugins/vst_base/RemoteVstPlugin.cpp
#	src/core/RemotePlugin.cpp
#	src/core/Song.cpp
#	src/core/Track.cpp
#	src/gui/SubWindow.cpp
#	src/gui/widgets/Graph.cpp

cmake/linux/lmms.desktop

@@ -10,7 +10,7 @@ Comment[ca]=Producció fàcil de música per a tothom!
 Comment[fr]=Production facile de musique pour tout le monde !
 Comment[pl]=Prosta produkcja muzyki dla każdego!
 Icon=lmms
-Exec=env QT_X11_NO_NATIVE_MENUBAR=1 QT_AUTO_SCREEN_SCALE_FACTOR=1 lmms %f
+Exec=lmms %f
 Terminal=false
 Type=Application
 Categories=Qt;AudioVideo;Audio;Midi;

cmake/linux/package_linux.sh.in

@@ -187,10 +187,16 @@ rm -f "${APPDIR}/usr/lib/libwine.so.1"
 # Use system-provided carla
 rm -f "${APPDIR}usr/lib/"libcarla*.so
 
-# Move jack out of LD_LIBRARY_PATH
+# Remove bundled jack in LD_LIBRARY_PATH if exists
 if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
+   rm "${APPDIR}/usr/lib/libjack.so.0"
+fi
+
+# Bundle jack out of LD_LIBRARY_PATH
+JACK_LIB=$(ldd "${APPDIR}/usr/bin/lmms.real" | sed -n 's/\tlibjack\.so\.0 => \(.\+\) (0x[0-9a-f]\+)/\1/p')
+if [ -e "$JACK_LIB" ]; then
    mkdir -p "${APPDIR}usr/lib/lmms/optional/"
-   mv "${APPDIR}/usr/lib/libjack.so.0" "${APPDIR}usr/lib/lmms/optional/"
+   cp "$JACK_LIB" "${APPDIR}usr/lib/lmms/optional/"
 fi
 
 # Point the AppRun to the shim launcher

cmake/modules/BashCompletion.cmake

@@ -73,9 +73,10 @@ ELSE()
 		FILE(WRITE ${BASHCOMP_SCRIPT} "\
 #!${BASH}\n\
 set -e\n\
-BASHCOMP_PKG_PATH=\"${BASHCOMP_USER_PATH}\"\n\
 if [ -w \"${BASHCOMP_PKG_PATH}\" ]; then\n\
   BASHCOMP_PKG_PATH=\"${BASHCOMP_PKG_PATH}\"\n\
+else \n\
+  BASHCOMP_PKG_PATH=\"\$DESTDIR${BASHCOMP_USER_PATH}\"\n\
 fi\n\
 echo -e \"\\nInstalling bash completion...\\n\"\n\
 mkdir -p \"\$BASHCOMP_PKG_PATH\"\n\

cmake/modules/CheckSubmodules.cmake

@@ -27,6 +27,12 @@ SET(DEPTH_VALUE 100)
 SET(MAX_ATTEMPTS 2)
 
 MESSAGE("\nValidating submodules...")
+IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/.gitmodules")
+	MESSAGE("Skipping the check because .gitmodules not detected."
+		"Please make sure you have all submodules in the source tree!"
+	)
+	RETURN()
+ENDIF()
 FILE(READ "${CMAKE_SOURCE_DIR}/.gitmodules" SUBMODULE_DATA)
 
 # Force English locale