Merge remote branch 'origin/2.1'

Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp

src/plugins/qt4projectmanager/qtversionmanager.cpp

@@ -1089,6 +1089,7 @@ static bool queryQMakeVariables(const QString &binary, QHash<QString, QString> *
              "QT_INSTALL_BINS",
              "QT_INSTALL_DOCS",
              "QT_INSTALL_PREFIX",
+             "QT_INSTALL_IMPORTS",
              "QMAKEFEATURES"
         };
     QStringList args;
@@ -1723,6 +1724,16 @@ QString QtVersion::headerInstallPath() const
     return m_versionInfo["QT_INSTALL_HEADERS"];
 }
 
+QString QtVersion::frameworkInstallPath() const
+{
+#ifdef Q_OS_MAC
+    updateVersionInfo();
+    return m_versionInfo["QT_INSTALL_LIBS"];
+#else
+    return QString();
+#endif
+}
+
 bool QtVersion::hasExamples() const
 {
     updateVersionInfo();