diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-10-16 07:11:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-10-16 07:11:57 +0200 |
| commit | 511bd64f3f7c5312ed180d58d8be8be327b2f59e (patch) | |
| tree | 5e17044abd82c0d814a25d384254ac7122f9f0ba /src/plugins/android/androidmanager.cpp | |
| parent | 683e7aa6cff84171359384d861f160115921e632 (diff) | |
| parent | f612833d83f527cc3bcb394d689e93ab51c88e71 (diff) | |
| download | qt-creator-511bd64f3f7c5312ed180d58d8be8be327b2f59e.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Change-Id: I0ff6f659b7ccd4ff5a79e422a1d54488508fe05f
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 13c6f41ec4..b6b139ad2d 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -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 ®Ex) { const QRegularExpression regRx(regEx, |