Merge remote branch 'origin/1.3'

Conflicts:
	src/plugins/projectexplorer/outputwindow.cpp

src/plugins/qt4projectmanager/qtversionmanager.cpp

@@ -943,8 +943,7 @@ void QtVersion::updateVersionInfo() const
     m_hasDocumentation = false;
 
     QFileInfo qmake(qmakeCommand());
-    if (ProjectExplorer::DebuggingHelperLibrary::possibleQMakeCommands().contains(qmake.fileName())
-        && qmake.exists()) {
+    if (qmake.exists() && qmake.isExecutable()) {
         static const char * const variables[] = {
              "QT_VERSION",
              "QT_INSTALL_DATA",