Merge remote-tracking branch 'origin/3.0'

2013-11-19 07:41:47 +01:00
parent 72e81db349 d190e7ca91
commit 8fe04ce0ad
103 changed files with 1047 additions and 544 deletions
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -150,6 +150,7 @@ private:

    int getSDKVersion(const QString &device) const;
    QStringList getAbis(const QString &device) const;
+    bool isBootToQt(const QString &device) const;
    void updateAvailableNdkPlatforms();
    void updateAvailableSdkPlatforms();