diff --git a/CMakeLists.txt b/CMakeLists.txt index ecfae6b..756eae8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(META_APP_DESCRIPTION "Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models") set(META_VERSION_MAJOR 6) set(META_VERSION_MINOR 4) -set(META_VERSION_PATCH 1) +set(META_VERSION_PATCH 2) set(META_APP_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}) project(${META_PROJECT_NAME}) diff --git a/aboutdialog/aboutdialog.cpp b/aboutdialog/aboutdialog.cpp index 2a3280d..8477e2e 100644 --- a/aboutdialog/aboutdialog.cpp +++ b/aboutdialog/aboutdialog.cpp @@ -54,7 +54,7 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const m_ui->productNameLabel->setText(QApplication::applicationName()); } if (creator.startsWith(QLatin1Char('<'))) { - // assing rich text as-is + // assign rich text as-is m_ui->creatorLabel->setText(creator); } else { // add "developed by " before creator name diff --git a/cmake/modules/AndroidApk.cmake b/cmake/modules/AndroidApk.cmake index 3d42d4f..7b02a98 100644 --- a/cmake/modules/AndroidApk.cmake +++ b/cmake/modules/AndroidApk.cmake @@ -223,7 +223,7 @@ function (add_android_apk_extra_libs TARGET_NAME) else () message( STATUS "Unable to find library \"${LIBRARY}\" required by target \"${TARGET_NAME}\". The library is likely " - "a private dependency of the target and therfore not visible within the context of creating the " + "a private dependency of the target and therefore not visible within the context of creating the " "final application. Relying on androiddeployqt for adding it to the APK.") endif () endforeach () diff --git a/cmake/modules/QtConfig.cmake b/cmake/modules/QtConfig.cmake index de654c0..f51bba3 100644 --- a/cmake/modules/QtConfig.cmake +++ b/cmake/modules/QtConfig.cmake @@ -505,7 +505,7 @@ if (REQUIRED_ICONS) unset(ICON_THEME_PATH) endforeach () if (NOT ICON_THEME_PATH) - message(FATAL_ERROR "The specified icon theme \"${ICON_THEME}\" coud not be found.") + message(FATAL_ERROR "The specified icon theme \"${ICON_THEME}\" could not be found.") endif () endforeach () set(BUILTIN_ICON_THEMES_QRC_FILE "${CMAKE_CURRENT_BINARY_DIR}/icons/${META_PROJECT_NAME}_builtinicons.qrc") diff --git a/cmake/modules/QtGuiConfig.cmake b/cmake/modules/QtGuiConfig.cmake index 10e8a2e..1c19935 100644 --- a/cmake/modules/QtGuiConfig.cmake +++ b/cmake/modules/QtGuiConfig.cmake @@ -69,7 +69,7 @@ elseif (APPLE) set(GUI_TYPE MACOSX_BUNDLE) endif () -# add source files requried by both GUI variants +# add source files required by both GUI variants list(APPEND SRC_FILES ${GUI_SRC_FILES}) list(APPEND ADDITIONAL_HEADER_FILES ${GUI_HEADER_FILES}) diff --git a/enterpassworddialog/enterpassworddialog.h b/enterpassworddialog/enterpassworddialog.h index 61824a4..cf97d8e 100644 --- a/enterpassworddialog/enterpassworddialog.h +++ b/enterpassworddialog/enterpassworddialog.h @@ -79,7 +79,7 @@ inline const QString &EnterPasswordDialog::password() const * * The instruction text is displayed at the top of the dialog. * If the instruction text is empty the default text "Enter the new password" - * or "Enter the password" (depending on whether the verification is requried or + * or "Enter the password" (depending on whether the verification is required or * not) displayed. * * \sa EnterPasswordDialog::setInstruction() diff --git a/misc/dialogutils.cpp b/misc/dialogutils.cpp index 85723e7..d583b3c 100644 --- a/misc/dialogutils.cpp +++ b/misc/dialogutils.cpp @@ -181,7 +181,7 @@ void centerWidget(QWidget *widget, const QWidget *parent, const QPoint *position * \brief Moves the specified \a widget to be centered within the (available) screen area or \a parent if specified. * \returns Returns whether an overflow occurred. * \remarks - * - If the widget overflows it is resized to take the whole available space in the dimention(s) that overflow. + * - If the widget overflows it is resized to take the whole available space in the dimension(s) that overflow. * If the widget is a window, its frame is attempted to be taken into account. If the window frame can not be determined * a generous assumption is made. It can nevertheless make sense to simply show \a widget using QWidget::showMaximized() * to make it simply fill the entire screen after all. diff --git a/scripts/svg_to_png.sh b/scripts/svg_to_png.sh index 4d4d42f..7383cc6 100755 --- a/scripts/svg_to_png.sh +++ b/scripts/svg_to_png.sh @@ -18,7 +18,7 @@ for srcdir in "$@"; do for svg_icon_full_path in $(find "$srcdir" -iname '*.svg'); do prefix="${svg_icon_full_path%/scalable/*}" svg_icon="${svg_icon_full_path##*/scalable/}" - # add inkscape command for each icon and size and ensure ouput directory exists + # add inkscape command for each icon and size and ensure output directory exists for size in 16 32 48; do mkdir -p "${prefix}/${size}x${size}/${svg_icon%/*.svg}" cmds+=("inkscape --without-gui \"${svg_icon_full_path}\" --export-png=\"${prefix}/${size}x${size}/${svg_icon%.svg}.png\" --export-width=${size} --export-height=${size}") diff --git a/settingsdialog/qtappearanceoptionpage.ui b/settingsdialog/qtappearanceoptionpage.ui index f91b0e9..eab1143 100644 --- a/settingsdialog/qtappearanceoptionpage.ui +++ b/settingsdialog/qtappearanceoptionpage.ui @@ -247,7 +247,7 @@ These settings take effect after restarting the application. -These settings might be overwritten by your Qt platfrom integration plugin and hence have no effect. +These settings might be overwritten by your Qt platform integration plugin and hence have no effect. Qt::PlainText diff --git a/settingsdialog/qtsettings.cpp b/settingsdialog/qtsettings.cpp index 3c2ea5f..46438c3 100644 --- a/settingsdialog/qtsettings.cpp +++ b/settingsdialog/qtsettings.cpp @@ -75,7 +75,7 @@ QtSettings::QtSettings() /*! * \brief Destroys the settings object. - * \remarks Unlike QSettings not explicitely saved settings are not saved + * \remarks Unlike QSettings not explicitly saved settings are not saved * automatically. */ QtSettings::~QtSettings() @@ -91,7 +91,7 @@ bool QtSettings::hasCustomFont() const } /*! - * \brief Restors the settings from the specified QSettings object. + * \brief Restores the settings from the specified QSettings object. * \remarks The restored values are not applied automatically (except * translation path). * \sa apply(), save() @@ -142,7 +142,7 @@ void QtSettings::save(QSettings &settings) const } /*! - * \brief Applies the current configuraion. + * \brief Applies the current configuration. * \remarks * - Some settings take only affect after restarting the application. * - QApplication/QGuiApplication must be instantiated before calling this diff --git a/settingsdialog/settingsdialog.cpp b/settingsdialog/settingsdialog.cpp index 14bb246..d814249 100644 --- a/settingsdialog/settingsdialog.cpp +++ b/settingsdialog/settingsdialog.cpp @@ -250,7 +250,7 @@ bool SettingsDialog::apply() QStringList &errors = const_cast(page)->errors(); if (errors.isEmpty()) { errorMessage.append(QStringLiteral("
  • ") % category->displayName() % QLatin1Char('/') % page->widget()->windowTitle() - % QStringLiteral(": ") % tr("unknonw error") % QStringLiteral("
  • ")); + % QStringLiteral(": ") % tr("unknown error") % QStringLiteral("")); } else { for (const QString &error : errors) { errorMessage.append(QStringLiteral("
  • ") % category->displayName() % QLatin1Char('/') % page->widget()->windowTitle()