Commit fa3f3a47 authored by Alexander Lohnau's avatar Alexander Lohnau 💬
Browse files

Merge branch 'release/20.04'

parents 5351db95 514d9c8f
......@@ -33,6 +33,9 @@
#include <QMimeData>
#include <QTimer>
#include <QWidget>
#include <QMutex>
Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_collatorMutex, (QMutex::Recursive))
// #define KFILEITEMMODEL_DEBUG
......@@ -1878,6 +1881,8 @@ int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b, const
int KFileItemModel::stringCompare(const QString& a, const QString& b, const QCollator& collator) const
{
QMutexLocker collatorLock(s_collatorMutex());
if (m_naturalSorting) {
return collator.compare(a, b);
}
......
......@@ -4,6 +4,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"dolphin_servicemenuinstaller\")
add_executable(servicemenuinstaller servicemenuinstaller.cpp)
target_link_libraries(servicemenuinstaller PRIVATE
Qt5::Core
Qt5::Gui
KF5::I18n
)
install(TARGETS servicemenuinstaller ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
......@@ -25,6 +25,9 @@
#include <QDirIterator>
#include <QCommandLineParser>
#include <QMimeDatabase>
#include <QUrl>
#include <QDesktopServices>
#include <QGuiApplication>
#include <KLocalizedString>
......@@ -201,6 +204,10 @@ bool cmdInstall(const QString &archive, QString &errorText)
return false;
}
} else {
const QStringList binaryPackages = {"application/vnd.debian.binary-package", "application/x-rpm"};
if (binaryPackages.contains(QMimeDatabase().mimeTypeForFile(archive).name())) {
return QDesktopServices::openUrl(QUrl(archive));
}
const QString dir = generateDirPath(archive);
if (QFile::exists(dir)) {
if (!QDir(dir).removeRecursively()) {
......@@ -318,7 +325,7 @@ bool cmdUninstall(const QString &archive, QString &errorText)
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
QGuiApplication app(argc, argv);
QCommandLineParser parser;
parser.addPositionalArgument(QStringLiteral("command"), i18nc("@info:shell", "Command to execute: install or uninstall."));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment