1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove QRegularExpression dependency

Browse Source 
Fix build error with -no-feature-regularexpression.

Change-Id: I6d3d0228548d832abea74b8e1145dc5b09f77b1b
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
This commit is contained in:
Paul Olav Tvete 2017-03-01 14:20:37 +01:00
parent a89c479a01
commit 44577f8cfb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -160,7 +160,9 @@ void QWaylandWindow::initWindow()
// when available. // when available.
if (!QGuiApplication::desktopFileName().isEmpty()) { if (!QGuiApplication::desktopFileName().isEmpty()) {
QString name = QGuiApplication::desktopFileName(); QString name = QGuiApplication::desktopFileName();
mShellSurface->setAppId(name.replace(QRegularExpression(QLatin1String("\\.desktop$")), QString())); if (name.endsWith(QLatin1String(".desktop")))
name.chop(8);
mShellSurface->setAppId(name);
} else { } else {
QFileInfo fi = QCoreApplication::instance()->applicationFilePath(); QFileInfo fi = QCoreApplication::instance()->applicationFilePath();
QStringList domainName = QStringList domainName =