diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2024-02-05 14:28:06 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2024-02-14 09:30:07 +0000 |
| commit | 6ea922b584a5f55cb73519aa81f074db59b96404 (patch) | |
| tree | cf224b17ce1c067fd51cea02c3541e5bb0add4ef | |
| parent | 65c40290b488395ee7c1fdfabc4d274889d9afab (diff) | |
Remove year from generic Qt copyright information
While at it, also add the missing dot in Ltd. (as
it's an abbreviation). Also, prefer https:// over
http://.
Fixes: QTBUG-121906
Task-number: QTBUG-121928
Pick-to: 6.7 6.6
Change-Id: I4e1f1563376ae36b3c260359d830f00969ab9351
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | .cmake.conf | 3 | ||||
| -rw-r--r-- | cmake/QtPostProcessHelpers.cmake | 1 | ||||
| -rw-r--r-- | configure.cmake | 3 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/.cmake.conf b/.cmake.conf index cfc3f8c5ff..87091cdd64 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -10,8 +10,7 @@ endif() set(QT_REPO_MODULE_VERSION "6.8.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") -set(QT_COPYRIGHT_YEAR "2023") -set(QT_COPYRIGHT "Copyright (C) ${QT_COPYRIGHT_YEAR} The Qt Company Ltd and other contributors.") +set(QT_COPYRIGHT "Copyright (C) The Qt Company Ltd. and other contributors.") # Minimum requirement for building Qt set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_BUILDING_QT_SHARED "3.16") diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index dfcbefd4f8..82d8fffee8 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -716,7 +716,6 @@ set(OpenGL_GL_PREFERENCE \"${OpenGL_GL_PREFERENCE}\" CACHE STRING \"\") string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS " -set(QT_COPYRIGHT_YEAR \"${QT_COPYRIGHT_YEAR}\" CACHE STRING \"\") set(QT_COPYRIGHT \"${QT_COPYRIGHT}\" CACHE STRING \"\") ") diff --git a/configure.cmake b/configure.cmake index e6fa9d3d37..e69eee70d6 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1300,8 +1300,7 @@ qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC) qt_extra_definition("QT_VERSION_MINOR" ${PROJECT_VERSION_MINOR} PUBLIC) qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC) -qt_extra_definition("QT_COPYRIGHT" \"${QT_COPYRIGHT}\" PRIVATE) -qt_extra_definition("QT_COPYRIGHT_YEAR" \"${QT_COPYRIGHT_YEAR}\" PRIVATE) +qt_extra_definition("QT_COPYRIGHT" \"${QT_COPYRIGHT}\" PUBLIC) qt_configure_add_report_entry( TYPE WARNING diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 573d7e6a15..ab49835601 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -749,13 +749,14 @@ extern "C" void qt_core_boilerplate() __attribute__((force_align_arg_pointer)); void qt_core_boilerplate() { printf("This is the QtCore library version %s\n" - "Copyright (C) 2023 The Qt Company Ltd.\n" - "Contact: http://www.qt.io/licensing/\n" + "%s\n" + "Contact: https://www.qt.io/licensing/\n" "\n" "Installation prefix: %s\n" "Library path: %s\n" "Plugin path: %s\n", QT_PREPEND_NAMESPACE(qt_build_string)(), + QT_COPYRIGHT, QT_CONFIGURE_PREFIX_PATH, qt_configure_strs[QT_PREPEND_NAMESPACE(QLibraryInfo)::LibrariesPath - 1], qt_configure_strs[QT_PREPEND_NAMESPACE(QLibraryInfo)::PluginsPath - 1]); diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index cc8e985caf..f219be565b 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -2022,7 +2022,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "<p>Qt and the Qt logo are trademarks of The Qt Company Ltd.</p>" "<p>Qt is The Qt Company Ltd product developed as an open source " "project. See <a href=\"http://%3/\">%3</a> for more information.</p>" - ).arg(QLatin1String(QT_COPYRIGHT_YEAR), + ).arg(QString(), QStringLiteral("qt.io/licensing"), QStringLiteral("qt.io")); QMessageBox *msgBox = new QMessageBox(parent); |