Imported recent patches from stable branch

configure

@@ -529,6 +529,17 @@ public:
 			} else {
 				return false;
 			}
+			QStringList incs3;
+                        QString req_ver3 = "2.0";
+                        QString version3, libs3, other3;
+			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
+                                for(int n = 0; n < incs3.count(); ++n)
+                                conf->addIncludePath(incs3[n]);
+                                if(!libs3.isEmpty())
+                                        conf->addLib(libs3);
+                        } else {
+                                return false;
+                        }
 		} else {
 			return false;
 		}

qcm/libnotify.qcm

@@ -40,6 +40,17 @@ public:
 			} else {
 				return false;
 			}
+			QStringList incs3;
+                        QString req_ver3 = "2.0";
+                        QString version3, libs3, other3;
+			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
+                                for(int n = 0; n < incs3.count(); ++n)
+                                conf->addIncludePath(incs3[n]);
+                                if(!libs3.isEmpty())
+                                        conf->addLib(libs3);
+                        } else {
+                                return false;
+                        }
 		} else {
 			return false;
 		}

src/main.cpp

@@ -181,6 +181,14 @@ int main(int argc, char *argv[]){
 #endif
 #endif
 
+  // XXX: Workaround to avoid the following Qt bug:
+  // http://bugreports.qt.nokia.com/browse/QTBUG-7105
+#ifndef DISABLE_GUI
+  // Force the creation of an input context to avoid
+  // a crash in QApplication destructor
+  app->inputContext();
+#endif
+
   // Check if qBittorrent is already running for this user
   if(app->isRunning()) {
     qDebug("qBittorrent is already running for this user.");