Merge branch 'master' into fix-segfaults-on-travis

README.md

@@ -137,7 +137,7 @@ This PR, when merged, will compile this application on [Travis CI](https://travi
 For this to work, you need to enable Travis CI for your repository as [described here](https://travis-ci.org/getting_started) __prior to merging this__, if you haven't already done so.
 
 Providing an [AppImage](http://appimage.org/) would have, among others, these advantages:
-- Works for most Linux distributions (including Ubuntu, Fedora, openSUSE, CentOS, elementaryOS, Linux Mint, and others)
+- Applications packaged as an AppImage can run on many distributions (including Ubuntu, Fedora, openSUSE, CentOS, elementaryOS, Linux Mint, and others)
 - One app = one file = super simple for users: just download one AppImage file, [make it executable](http://discourse.appimage.org/t/how-to-make-an-appimage-executable/80), and run
 - No unpacking or installation necessary
 - No root needed

shared/shared.cpp

@@ -740,6 +740,7 @@ void runPatchelf(QStringList options)
 
 bool patchQtCore(const QString &path, const QString &variable, const QString &value)
 {
+    return true; // ################################### Disabling for now since using qt.conf
     QFile file(path);
     if (!file.open(QIODevice::ReadWrite)) {
         LogWarning() << QString::fromLatin1("Unable to patch %1: %2").arg(