diff options
| author | Tim Jenßen <tim.jenssen@qt.io> | 2023-03-26 15:58:49 +0200 |
|---|---|---|
| committer | Tim Jenßen <tim.jenssen@qt.io> | 2023-03-26 16:26:18 +0200 |
| commit | feabda3aa78b7861ae03f1cc2296e8adf34ba038 (patch) | |
| tree | 9bc06c7eeb6fca92e8cdd273908f7350260a8cb8 /src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp | |
| parent | 359ea5d55a9452d70c20754c2380b1bf1c704c04 (diff) | |
| parent | f7639f458a4b87263e96de70f26554a660148bc3 (diff) | |
| download | qt-creator-feabda3aa78b7861ae03f1cc2296e8adf34ba038.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
src/plugins/qmldesigner/CMakeLists.txt
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
Diffstat (limited to 'src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp index 1989146346..7f40fbf5d2 100644 --- a/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp +++ b/src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp @@ -1,9 +1,10 @@ // 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" #include "cmakegeneratordialog.h" +#include "../qmlprojectmanagertr.h" #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> @@ -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..."); const QmlBuildSystem *getBuildSystem() { @@ -76,8 +76,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); @@ -168,14 +167,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) { |