From d458c2c620d7f7f0051eccda693c907f89e2f325 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Thu, 8 May 2025 09:52:30 +0200 Subject: [PATCH] chore: remove never used crashreporter Signed-off-by: Jyrki Gadinger --- .gitmodules | 6 -- CPackOptions.cmake.in | 2 - NEXTCLOUD.cmake | 4 - admin/linux/clean_tarball.sh | 1 - cmake/modules/NSIS.template.in | 5 - config.h.in | 2 - doc/dev/Doxyfile.in | 1 - src/3rdparty/libcrashreporter-qt | 1 - src/CMakeLists.txt | 5 - src/crashreporter/CMakeLists.txt | 66 ------------ src/crashreporter/CrashReporterConfig.h.in | 16 --- .../CrashReporterConfig.h.in.license | 2 - src/crashreporter/main.cpp | 100 ------------------ src/crashreporter/resources.qrc | 5 - src/crashreporter/resources.qrc.license | 2 - src/gui/CMakeLists.txt | 9 -- src/gui/application.cpp | 16 --- src/gui/application.h | 7 -- src/gui/generalsettings.cpp | 7 -- src/gui/generalsettings.ui | 18 ---- src/libsync/configfile.cpp | 14 --- src/libsync/configfile.h | 3 - 22 files changed, 292 deletions(-) delete mode 100644 .gitmodules delete mode 160000 src/3rdparty/libcrashreporter-qt delete mode 100644 src/crashreporter/CMakeLists.txt delete mode 100644 src/crashreporter/CrashReporterConfig.h.in delete mode 100644 src/crashreporter/CrashReporterConfig.h.in.license delete mode 100644 src/crashreporter/main.cpp delete mode 100644 src/crashreporter/resources.qrc delete mode 100644 src/crashreporter/resources.qrc.license diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 1d96179b8f..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors -# SPDX-FileCopyrightText: 2013 ownCloud GmbH -# SPDX-License-Identifier: GPL-2.0-or-later -[submodule "src/3rdparty/libcrashreporter-qt"] - path = src/3rdparty/libcrashreporter-qt - url = https://github.com/dschmidt/libcrashreporter-qt.git diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in index 26388fd625..d38c4bf28b 100644 --- a/CPackOptions.cmake.in +++ b/CPackOptions.cmake.in @@ -16,8 +16,6 @@ set( CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@ ) include("${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake") -set( CRASHREPORTER_EXECUTABLE @CRASHREPORTER_EXECUTABLE@) - set( BUILD_OWNCLOUD_OSX_BUNDLE @BUILD_OWNCLOUD_OSX_BUNDLE@) if(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE) message( FATAL_ERROR "You're trying to build a bundle although you haven't built the client in bundle mode.\n Add -DBUILD_OWNCLOUD_OSX_BUNDLE=ON") diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake index ed9ad38ef8..054b303d80 100644 --- a/NEXTCLOUD.cmake +++ b/NEXTCLOUD.cmake @@ -46,10 +46,6 @@ set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-back # set( THEME_INCLUDE "${OEM_THEME_DIR}/mytheme.h" ) # set( APPLICATION_LICENSE "${OEM_THEME_DIR}/license.txt ) -option( WITH_CRASHREPORTER "Build crashreporter" OFF ) -#set( CRASHREPORTER_SUBMIT_URL "https://crash-reports.owncloud.com/submit" CACHE STRING "URL for crash reporter" ) -#set( CRASHREPORTER_ICON ":/owncloud-icon.png" ) - ## Updater options option( BUILD_UPDATER "Build updater" ON ) diff --git a/admin/linux/clean_tarball.sh b/admin/linux/clean_tarball.sh index 712ab10127..69d16d5136 100755 --- a/admin/linux/clean_tarball.sh +++ b/admin/linux/clean_tarball.sh @@ -6,6 +6,5 @@ rm -vrf admin/ rm -vrf src/3rdparty/sqlite3 # FIXME: For CentOS6 we have to use our bundled sqlite rm -vrf binary/ -rm -vrf src/3rdparty/libcrashreporter-qt rm -vrf shell_integration/windows rm -vrf shell_integration/MacOSX diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 5bbf9ff8ed..729d011872 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -14,8 +14,6 @@ !define APPLICATION_VIRTUALFILE_FILECLASS "@APPLICATION_EXECUTABLE@.@APPLICATION_VIRTUALFILE_SUFFIX@" !define WIN_SETUP_BITMAP_PATH "@WIN_SETUP_BITMAP_PATH@" -!define CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@" - ;----------------------------------------------------------------------------- ; Some installer script options (comment-out options not required) ;----------------------------------------------------------------------------- @@ -401,9 +399,6 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION File "${MING_SHARE}\qt5\translations\qtbase_*.qm" File "${MING_SHARE}\qt5\translations\qtkeychain_*.qm" - ;Add crash reporter if it was built - File /nonfatal "${BUILD_PATH}/bin/${CRASHREPORTER_EXECUTABLE}.exe" - SetOutPath "$INSTDIR\platforms" File "${PLATFORMS_DLL_PATH}\qwindows.dll" SetOutPath "$INSTDIR\imageformats" diff --git a/config.h.in b/config.h.in index 0e3f0eae91..1f8ec57476 100644 --- a/config.h.in +++ b/config.h.in @@ -3,10 +3,8 @@ #cmakedefine USE_INOTIFY 1 #cmakedefine WITH_QTKEYCHAIN 1 -#cmakedefine WITH_CRASHREPORTER #cmakedefine BUILD_FILE_PROVIDER_MODULE "@BUILD_FILE_PROVIDER_MODULE@" #cmakedefine WITH_PROVIDERS "@WITH_PROVIDERS@" -#cmakedefine CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@" #define SOCKETAPI_TEAM_IDENTIFIER_PREFIX "@SOCKETAPI_TEAM_IDENTIFIER_PREFIX@" #cmakedefine THEME_CLASS @THEME_CLASS@ diff --git a/doc/dev/Doxyfile.in b/doc/dev/Doxyfile.in index 3409b48199..c00791554e 100644 --- a/doc/dev/Doxyfile.in +++ b/doc/dev/Doxyfile.in @@ -744,7 +744,6 @@ WARN_LOGFILE = # Note: If this tag is empty the current directory is searched. INPUT = @CMAKE_SOURCE_DIR@/src/cmd \ - @CMAKE_SOURCE_DIR@/src/crashreporter \ @CMAKE_SOURCE_DIR@/src/gui \ @CMAKE_SOURCE_DIR@/src/libsync \ @CMAKE_CURRENT_SOURCE_DIR@ # for main README.md diff --git a/src/3rdparty/libcrashreporter-qt b/src/3rdparty/libcrashreporter-qt deleted file mode 160000 index 5423c0ef54..0000000000 --- a/src/3rdparty/libcrashreporter-qt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5423c0ef54f99cea2628c2cb3f48e39e215f9961 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8e380c5160..f584246eb7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -101,9 +101,4 @@ if (NOT BUILD_LIBRARIES_ONLY) if (BUILD_GUI) add_subdirectory(gui) endif() - - if (WITH_CRASHREPORTER) - add_subdirectory(3rdparty/libcrashreporter-qt) - add_subdirectory(crashreporter) - endif() endif(NOT BUILD_LIBRARIES_ONLY) diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt deleted file mode 100644 index 88cd86d8d4..0000000000 --- a/src/crashreporter/CMakeLists.txt +++ /dev/null @@ -1,66 +0,0 @@ -# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors -# SPDX-FileCopyrightText: 2014 ownCloud GmbH -# SPDX-License-Identifier: GPL-2.0-or-later -PROJECT( CrashReporter ) -cmake_policy(SET CMP0017 NEW) - -list(APPEND crashreporter_SOURCES main.cpp) -list(APPEND crashreporter_RC resources.qrc) - -# TODO: differentiate release channel -# if(BUILD_RELEASE) -# set(CRASHREPORTER_RELEASE_CHANNEL "release") -# else() - set(CRASHREPORTER_RELEASE_CHANNEL "nightly") -# endif() - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CrashReporterConfig.h.in - ${CMAKE_CURRENT_BINARY_DIR}/CrashReporterConfig.h) - - - -if(NOT BUILD_LIBRARIES_ONLY) - add_executable( ${CRASHREPORTER_EXECUTABLE} WIN32 - ${crashreporter_SOURCES} - ${crashreporter_HEADERS_MOC} - ${crashreporter_UI_HEADERS} - ${crashreporter_RC_RCC} - ) - - find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Widgets) - - target_include_directories(${CRASHREPORTER_EXECUTABLE} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON) - set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) - target_link_libraries(${CRASHREPORTER_EXECUTABLE} - crashreporter-gui - Qt::Core Qt::Widgets - ) - - if(BUILD_OWNCLOUD_OSX_BUNDLE) - install(TARGETS ${CRASHREPORTER_EXECUTABLE} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS) - elseif(NOT BUILD_LIBRARIES_ONLY) - install(TARGETS ${CRASHREPORTER_EXECUTABLE} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - # FIXME: The following lines are dup in src/gui and src/cmd because it needs to be done after both are installed - #FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary - # currently it needs to be done because the code right above needs to be executed no matter - # if building a bundle or not and the install_qt4_executable needs to be called afterwards - if(BUILD_OWNCLOUD_OSX_BUNDLE) - get_target_property (QT_QMAKE_EXECUTABLE Qt::qmake IMPORTED_LOCATION) - get_filename_component(QT_BIN_DIR "${QT_QMAKE_EXECUTABLE}" DIRECTORY) - find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${QT_BIN_DIR}") - - add_custom_command(TARGET ${CRASHREPORTER_EXECUTABLE} POST_BUILD - COMMAND "${MACDEPLOYQT_EXECUTABLE}" - "$/../.." - -qmldir=${CMAKE_SOURCE_DIR}/src/gui - -always-overwrite - COMMENT "Running macdeployqt..." - ) - endif() -endif() diff --git a/src/crashreporter/CrashReporterConfig.h.in b/src/crashreporter/CrashReporterConfig.h.in deleted file mode 100644 index d17edc7c68..0000000000 --- a/src/crashreporter/CrashReporterConfig.h.in +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef CRASHREPORTERCONFIG_H -#define CRASHREPORTERCONFIG_H - -#define CRASHREPORTER_BUILD_ID "@CMAKE_DATESTAMP_YEAR@@CMAKE_DATESTAMP_MONTH@@CMAKE_DATESTAMP_DAY@000000" - -#define CRASHREPORTER_RELEASE_CHANNEL "@CRASHREPORTER_RELEASE_CHANNEL@" - -#define CRASHREPORTER_PRODUCT_NAME "@APPLICATION_NAME@" - -#define CRASHREPORTER_VERSION_STRING "@MIRALL_VERSION_STRING@" - -#define CRASHREPORTER_SUBMIT_URL "@CRASHREPORTER_SUBMIT_URL@" - -#define CRASHREPORTER_ICON "@CRASHREPORTER_ICON@" - -#endif // CRASHREPORTERCONFIG_H diff --git a/src/crashreporter/CrashReporterConfig.h.in.license b/src/crashreporter/CrashReporterConfig.h.in.license deleted file mode 100644 index 0a84670041..0000000000 --- a/src/crashreporter/CrashReporterConfig.h.in.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-FileCopyrightText: 2014 ownCloud GmbH -SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/crashreporter/main.cpp b/src/crashreporter/main.cpp deleted file mode 100644 index e9be6b825c..0000000000 --- a/src/crashreporter/main.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2014 ownCloud GmbH - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "CrashReporterConfig.h" - -#include - -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); -#ifdef Q_OS_WIN - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); -#endif // !Q_OS_WIN - QApplication app(argc, argv); - -#ifdef Q_OS_WIN - // The Windows style still has pixelated elements with Qt 5.6, - // it's recommended to use the Fusion style in this case, even - // though it looks slightly less native. Check here after the - // QApplication was constructed, but before any QWidget is - // constructed. - if (app.devicePixelRatio() > 1) - QApplication::setStyle(QStringLiteral("fusion")); -#endif // Q_OS_WIN - - if (app.arguments().size() != 2) { - qDebug() << "You need to pass the .dmp file path as only argument"; - return 1; - } - - // TODO: install socorro .... - CrashReporter reporter(QUrl(CRASHREPORTER_SUBMIT_URL), app.arguments()); - -#ifdef CRASHREPORTER_ICON - reporter.setLogo(QPixmap(CRASHREPORTER_ICON)); -#endif - reporter.setWindowTitle(CRASHREPORTER_PRODUCT_NAME); - reporter.setText("

Sorry! " CRASHREPORTER_PRODUCT_NAME " crashed. Please tell us about it! " CRASHREPORTER_PRODUCT_NAME " has created an error report for you that can help improve the stability in the future. You can now send this report directly to the " CRASHREPORTER_PRODUCT_NAME " developers.

"); - - const QFileInfo crashLog(QDir::tempPath() + QStringLiteral("/" CRASHREPORTER_PRODUCT_NAME "-crash.log")); - if (crashLog.exists()) { - QFile inFile(crashLog.filePath()); - if (inFile.open(QFile::ReadOnly)) { - reporter.setComment(inFile.readAll()); - } - } - - reporter.setReportData("BuildID", CRASHREPORTER_BUILD_ID); - reporter.setReportData("ProductName", CRASHREPORTER_PRODUCT_NAME); - reporter.setReportData("Version", CRASHREPORTER_VERSION_STRING); - reporter.setReportData("ReleaseChannel", CRASHREPORTER_RELEASE_CHANNEL); - - //reporter.setReportData( "timestamp", QByteArray::number( QDateTime::currentDateTime().toTime_t() ) ); - - - // add parameters - - // << Pair("InstallTime", "1357622062") - // << Pair("Theme", "classic/1.0") - // << Pair("Version", "30") - // << Pair("id", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") - // << Pair("Vendor", "Mozilla") - // << Pair("EMCheckCompatibility", "true") - // << Pair("Throttleable", "0") - // << Pair("URL", "http://code.google.com/p/crashme/") - // << Pair("version", "20.0a1") - // << Pair("CrashTime", "1357770042") - // << Pair("submitted_timestamp", "2013-01-09T22:21:18.646733+00:00") - // << Pair("buildid", "20130107030932") - // << Pair("timestamp", "1357770078.646789") - // << Pair("Notes", "OpenGL: NVIDIA Corporation -- GeForce 8600M GT/PCIe/SSE2 -- 3.3.0 NVIDIA 313.09 -- texture_from_pixmap\r\n") - // << Pair("StartupTime", "1357769913") - // << Pair("FramePoisonSize", "4096") - // << Pair("FramePoisonBase", "7ffffffff0dea000") - // << Pair("Add-ons", "%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:20.0a1,crashme%40ted.mielczarek.org:0.4") - // << Pair("SecondsSinceLastCrash", "1831736") - // << Pair("ProductName", "WaterWolf") - // << Pair("legacy_processing", "0") - // << Pair("ProductID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") - - ; - - // TODO: - // send log - // QFile logFile( INSERT_FILE_PATH_HERE ); - // logFile.open( QFile::ReadOnly ); - // reporter.setReportData( "upload_file_miralllog", qCompress( logFile.readAll() ), "application/x-gzip", QFileInfo( INSERT_FILE_PATH_HERE ).fileName().toUtf8()); - // logFile.close(); - - reporter.show(); - - return app.exec(); -} diff --git a/src/crashreporter/resources.qrc b/src/crashreporter/resources.qrc deleted file mode 100644 index 830281e77e..0000000000 --- a/src/crashreporter/resources.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - ../../theme/colored/owncloud-icon-128.png - - diff --git a/src/crashreporter/resources.qrc.license b/src/crashreporter/resources.qrc.license deleted file mode 100644 index 0a84670041..0000000000 --- a/src/crashreporter/resources.qrc.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-FileCopyrightText: 2014 ownCloud GmbH -SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 4c7f814b1b..a92ee0424f 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -724,15 +724,6 @@ if (APPLE) endif() endif() -if(WITH_CRASHREPORTER) - target_link_libraries(nextcloudCore PUBLIC crashreporter-handler) - - if(UNIX AND NOT MAC) - find_package(Threads REQUIRED) - target_link_libraries(nextcloudCore PUBLIC Threads::Threads) - endif() -endif() - install(TARGETS nextcloud RUNTIME DESTINATION bin LIBRARY DESTINATION lib diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 4584b70e24..38dac21532 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -45,10 +45,6 @@ #include "macOS/fileprovider.h" #endif -#if defined(WITH_CRASHREPORTER) -#include -#endif - #include #include #include @@ -317,18 +313,6 @@ Application::Application(int &argc, char **argv) return; } -#if defined(WITH_CRASHREPORTER) - if (ConfigFile().crashReporter()) { - auto reporter = QStringLiteral(CRASHREPORTER_EXECUTABLE); -#ifdef Q_OS_WIN - if (!reporter.endsWith(QLatin1String(".exe"))) { - reporter.append(QLatin1String(".exe")); - } -#endif - _crashHandler.reset(new CrashReporter::Handler(QDir::tempPath(), true, reporter)); - } -#endif - setupLogging(); setupTranslations(); diff --git a/src/gui/application.h b/src/gui/application.h index 9e703c8f03..caba9df0e8 100644 --- a/src/gui/application.h +++ b/src/gui/application.h @@ -28,10 +28,6 @@ class QMessageBox; class QSystemTrayIcon; class QSocket; -namespace CrashReporter { -class Handler; -} - namespace OCC { Q_DECLARE_LOGGING_CATEGORY(lcApplication) @@ -144,9 +140,6 @@ private: QString _overrideLocalDir; QString _setLanguage; -#if defined(WITH_CRASHREPORTER) - QScopedPointer _crashHandler; -#endif QScopedPointer _folderManager; #if defined(Q_OS_WIN) QScopedPointer _shellExtensionsServer; diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index c4ce8b2e25..dbc5d8051d 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -229,7 +229,6 @@ GeneralSettings::GeneralSettings(QWidget *parent) // misc connect(_ui->monoIconsCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings); - connect(_ui->crashreporterCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings); connect(_ui->newFolderLimitCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings); connect(_ui->newFolderLimitSpinBox, static_cast(&QSpinBox::valueChanged), this, &GeneralSettings::saveMiscSettings); connect(_ui->existingFolderLimitCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings); @@ -238,10 +237,6 @@ GeneralSettings::GeneralSettings(QWidget *parent) connect(_ui->moveFilesToTrashCheckBox, &QAbstractButton::toggled, this, &GeneralSettings::saveMiscSettings); connect(_ui->remotePollIntervalSpinBox, &QSpinBox::valueChanged, this, &GeneralSettings::slotRemotePollIntervalChanged); -#ifndef WITH_CRASHREPORTER - _ui->crashreporterCheckBox->setVisible(false); -#endif - // Hide on non-Windows, or WindowsVersion < 10. // The condition should match the default value of ConfigFile::showInExplorerNavigationPane. #ifdef Q_OS_WIN @@ -304,7 +299,6 @@ void GeneralSettings::loadMiscSettings() _ui->callNotificationsCheckBox->setEnabled(cfgFile.optionalServerNotifications()); _ui->callNotificationsCheckBox->setChecked(cfgFile.showCallNotifications()); _ui->showInExplorerNavigationPaneCheckBox->setChecked(cfgFile.showInExplorerNavigationPane()); - _ui->crashreporterCheckBox->setChecked(cfgFile.crashReporter()); _ui->newExternalStorage->setChecked(cfgFile.confirmExternalStorage()); _ui->monoIconsCheckBox->setChecked(cfgFile.monoIcons()); _ui->moveFilesToTrashCheckBox->setChecked(cfgFile.moveToTrash()); @@ -525,7 +519,6 @@ void GeneralSettings::saveMiscSettings() Theme::instance()->setSystrayUseMonoIcons(useMonoIcons); cfgFile.setMonoIcons(useMonoIcons); - cfgFile.setCrashReporter(_ui->crashreporterCheckBox->isChecked()); cfgFile.setMoveToTrash(_ui->moveFilesToTrashCheckBox->isChecked()); cfgFile.setNewBigFolderSizeLimit(newFolderLimitEnabled, _ui->newFolderLimitSpinBox->value()); cfgFile.setConfirmExternalStorage(_ui->newExternalStorage->isChecked()); diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui index 623835e149..534f17e193 100644 --- a/src/gui/generalsettings.ui +++ b/src/gui/generalsettings.ui @@ -208,23 +208,6 @@ - - - - - - - 0 - 0 - - - - S&how crash reporter - - - - - @@ -502,7 +485,6 @@ ignoredFilesButton newFolderLimitCheckBox newFolderLimitSpinBox - crashreporterCheckBox restartButton diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index a32c38e1d3..0416d205ec 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -46,7 +46,6 @@ static constexpr char fullLocalDiscoveryIntervalC[] = "fullLocalDiscoveryInterva static constexpr char notificationRefreshIntervalC[] = "notificationRefreshInterval"; static constexpr char monoIconsC[] = "monoIcons"; static constexpr char deleteFilesThresholdC[] = "deleteFilesThreshold"; -static constexpr char crashReporterC[] = "crashReporter"; static constexpr char skipUpdateCheckC[] = "skipUpdateCheck"; static constexpr char autoUpdateCheckC[] = "autoUpdateCheck"; static constexpr char updateCheckIntervalC[] = "updateCheckInterval"; @@ -1087,19 +1086,6 @@ void ConfigFile::setMonoIcons(bool useMonoIcons) settings.setValue(QLatin1String(monoIconsC), useMonoIcons); } -bool ConfigFile::crashReporter() const -{ - QSettings settings(configFile(), QSettings::IniFormat); - const auto fallback = settings.value(QLatin1String(crashReporterC), true); - return getPolicySetting(QLatin1String(crashReporterC), fallback).toBool(); -} - -void ConfigFile::setCrashReporter(bool enabled) -{ - QSettings settings(configFile(), QSettings::IniFormat); - settings.setValue(QLatin1String(crashReporterC), enabled); -} - bool ConfigFile::automaticLogDir() const { QSettings settings(configFile(), QSettings::IniFormat); diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h index dd988cef30..5421359c98 100644 --- a/src/libsync/configfile.h +++ b/src/libsync/configfile.h @@ -90,9 +90,6 @@ public: [[nodiscard]] int deleteFilesThreshold() const; void setDeleteFilesThreshold(int thresholdValue); - [[nodiscard]] bool crashReporter() const; - void setCrashReporter(bool enabled); - [[nodiscard]] bool automaticLogDir() const; void setAutomaticLogDir(bool enabled);