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

Android: Use QRegularExpression to check package names

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I1082d39e65c4237592c81758fcdde614fc50d6e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-06-10 09:28:31 +02:00
parent 61d6120619
commit 3a690154cb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -72,6 +72,7 @@
#include <QListView>
#include <QMessageBox>
#include <QPushButton>
#include <QRegularExpression>
#include <QScrollArea>
#include <QSpinBox>
#include <QTimer>
@@ -85,12 +86,12 @@ using namespace Android;
using namespace Android::Internal;
namespace {
const QLatin1String packageNameRegExp("^([a-z]{1}[a-z0-9_]+(\\.[a-zA-Z]{1}[a-zA-Z0-9_]*)*)$");
const char infoBarId[] = "Android.AndroidManifestEditor.InfoBar";
bool checkPackageName(const QString &packageName)
{
return QRegExp(packageNameRegExp).exactMatch(packageName);
const QLatin1String packageNameRegExp("^([a-z]{1}[a-z0-9_]+(\\.[a-zA-Z]{1}[a-zA-Z0-9_]*)*)$");
return QRegularExpression(packageNameRegExp).match(packageName).hasMatch();
}
Target *androidTarget(const Utils::FilePath &fileName)