diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt --- a/src/ioslaves/http/CMakeLists.txt +++ b/src/ioslaves/http/CMakeLists.txt @@ -52,6 +52,7 @@ KF5::KIOCore # KProtocolManager KF5::I18n) +set_target_properties(kio_http_cache_cleaner PROPERTIES OUTPUT_NAME kio_http_cache_cleaner5) install(TARGETS kio_http_cache_cleaner DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5} ) ########### next target ############### diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp --- a/src/ioslaves/http/http.cpp +++ b/src/ioslaves/http/http.cpp @@ -4986,7 +4986,7 @@ return; Q_ASSERT(command.size() == BinaryCacheFileHeader::size + s_hashedUrlNibbles + sizeof(quint32)); if (m_cacheCleanerConnection.state() != QLocalSocket::ConnectedState) { - QString socketFileName = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1Char('/') + QLatin1String("kio_http_cache_cleaner"); + QString socketFileName = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1Char('/') + QLatin1String("kio_http_cache_cleaner5"); m_cacheCleanerConnection.connectToServer(socketFileName, QIODevice::WriteOnly); if (m_cacheCleanerConnection.state() == QLocalSocket::UnconnectedState) { @@ -4998,9 +4998,9 @@ << QCoreApplication::applicationDirPath() // then look where our application binary is located << QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath) // look where libexec path is (can be set in qt.conf) << QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5); // look at our installation location - const QString exe = QStandardPaths::findExecutable(QStringLiteral("kio_http_cache_cleaner"), searchPaths); + const QString exe = QStandardPaths::findExecutable(QStringLiteral("kio_http_cache_cleaner5"), searchPaths); if (exe.isEmpty()) { - qCWarning(KIO_HTTP) << "kio_http_cache_cleaner not found in" << searchPaths; + qCWarning(KIO_HTTP) << "kio_http_cache_cleaner5 not found in" << searchPaths; return; } qCDebug(KIO_HTTP) << "starting" << exe; diff --git a/src/ioslaves/http/http_cache_cleaner.cpp b/src/ioslaves/http/http_cache_cleaner.cpp --- a/src/ioslaves/http/http_cache_cleaner.cpp +++ b/src/ioslaves/http/http_cache_cleaner.cpp @@ -53,7 +53,7 @@ qint64 g_maxCacheSize; static const char appFullName[] = "org.kio5.kio_http_cache_cleaner"; -static const char appName[] = "kio_http_cache_cleaner"; +static const char appName[] = "kio_http_cache_cleaner5"; // !START OF SYNC! // Keep the following in sync with the cache code in http.cpp @@ -780,7 +780,7 @@ } QLocalServer lServer; - QString socketFileName = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1Char('/') + "kio_http_cache_cleaner"; + QString socketFileName = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation) + QLatin1Char('/') + "kio_http_cache_cleaner5"; // we need to create the file by opening the socket, otherwise it won't work QFile::remove(socketFileName); if (!lServer.listen(socketFileName)) { diff --git a/src/ioslaves/http/http_cache_cleaner.desktop b/src/ioslaves/http/http_cache_cleaner.desktop --- a/src/ioslaves/http/http_cache_cleaner.desktop +++ b/src/ioslaves/http/http_cache_cleaner.desktop @@ -50,7 +50,7 @@ Name[zh_CN]=HTTP 缓存清除程序 Name[zh_HK]=HTTP 快取清除程式 Name[zh_TW]=HTTP 快取清除程式 -Exec=kio_http_cache_cleaner +Exec=kio_http_cache_cleaner5 Comment=Cleans up old entries from the HTTP cache Comment[ar]=ينظّف خبيئة HTTP من المُدخلات القديمة Comment[ast]=Llimpia les entraes vieyes de la caché HTTP diff --git a/src/kcms/kio/cache.cpp b/src/kcms/kio/cache.cpp --- a/src/kcms/kio/cache.cpp +++ b/src/kcms/kio/cache.cpp @@ -120,7 +120,7 @@ void CacheConfigModule::on_clearCacheButton_clicked() { - QString exe = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kio_http_cache_cleaner"); + QString exe = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kio_http_cache_cleaner5"); if (QFile::exists(exe)) { QProcess::startDetached(exe, QStringList(QStringLiteral("--clear-all")));