feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Change-Id: I0ff6f659b7ccd4ff5a79e422a1d54488508fe05f
This commit is contained in:
Eike Ziller
2018-10-16 07:11:57 +02:00
parent 683e7aa6cf f612833d83
commit 511bd64f3f
100 changed files with 344 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidmanager.cpp
View File

@@ -75,7 +75,7 @@ namespace {
const QString apkVersionRegEx("(?<token>package: )(.*?)(versionCode=)'(?<target>.*?)'");
const QString versionCodeRegEx("(?<token>versionCode=)(?<version>\\d*)");
Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager")
Q_LOGGING_CATEGORY(androidManagerLog, "qtc.android.androidManager", QtWarningMsg)
QString parseAaptOutput(const QString &output, const QString &regEx) {
const QRegularExpression regRx(regEx,