From 56baf8c058792187b574cf988fcf4b313f527156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 21 Dec 2022 10:12:09 +0100 Subject: Remove GPL-3.0+ from license identifiers Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller --- src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp') diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp index b239ca75cc..969281bb8e 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "generatecmakelists.h" #include "generatecmakelistsconstants.h" -- cgit v1.2.1 From 0fff2aa172ce2f22e4fe5e0227f6731bbd5b56dd Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 19 Jan 2023 15:36:40 +0100 Subject: QmlProjectManager: Tr::tr Change-Id: I219111bab487ad5f2d7d1cd7ae6f3e3e8a2a8d3f Reviewed-by: hjk --- .../qmlprojectmanager/cmakegen/generatecmakelists.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp') diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp index 969281bb8e..ef83206d98 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp @@ -4,6 +4,7 @@ #include "generatecmakelists.h" #include "generatecmakelistsconstants.h" #include "cmakegeneratordialog.h" +#include "../qmlprojectmanagertr.h" #include #include @@ -56,8 +57,7 @@ enum ProjectDirectoryError { MissingEnvHeader = 1<<12 }; -const QString MENU_ITEM_GENERATE = QCoreApplication::translate("QmlDesigner::GenerateCmake", - "Generate CMake Build Files..."); +const QString MENU_ITEM_GENERATE = Tr::tr("Generate CMake Build Files..."); void generateMenuEntry(QObject *parent) { @@ -66,8 +66,7 @@ void generateMenuEntry(QObject *parent) Core::ActionContainer *exportMenu = Core::ActionManager::createMenu( QmlProjectManager::Constants::EXPORT_MENU); - exportMenu->menu()->setTitle( - QCoreApplication::translate("QmlDesigner::GenerateCmake", "Export Project")); + exportMenu->menu()->setTitle(Tr::tr("Export Project")); menu->addMenu(exportMenu, Core::Constants::G_FILE_EXPORT); exportMenu->appendGroup(QmlProjectManager::Constants::G_EXPORT_GENERATE); @@ -159,14 +158,10 @@ int isProjectCorrectlyFormed(const FilePath &rootDir) return errors; } -const QString WARNING_MISSING_STRUCTURE_FATAL = QCoreApplication::translate("QmlDesigner::GenerateCmake", - "The project is not properly structured for automatically generating CMake files.\n\nAborting process.\n\nThe following files or directories are missing:\n\n%1"); -//const QString WARNING_MISSING_STRUCTURE_NONFATAL = QCoreApplication::translate("QmlDesigner::GenerateCmake", -// "The project is not properly structured for automatically generating CMake files.\n\nThe following files or directories are missing and may be created:\n\n%1"); -const QString WARNING_TITLE_FATAL = QCoreApplication::translate("QmlDesigner::GenerateCmake", - "Cannot Generate CMake Files"); -//const QString WARNING_TITLE_NONFATAL = QCoreApplication::translate("QmlDesigner::GenerateCmake", -// "Problems with Generating CMake Files"); +const QString WARNING_MISSING_STRUCTURE_FATAL = Tr::tr("The project is not properly structured for automatically generating CMake files.\n\nAborting process.\n\nThe following files or directories are missing:\n\n%1"); +//const QString WARNING_MISSING_STRUCTURE_NONFATAL = Tr::tr("The project is not properly structured for automatically generating CMake files.\n\nThe following files or directories are missing and may be created:\n\n%1"); +const QString WARNING_TITLE_FATAL = Tr::tr("Cannot Generate CMake Files"); +//const QString WARNING_TITLE_NONFATAL = Tr::tr("Problems with Generating CMake Files"); void showProjectDirErrorDialog(int error) { -- cgit v1.2.1