feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Translations: Remove stray Q_DECLARE_TR_FUNCTIONS(...)

Browse Source 
And handle the consequences in qmakebuildconfiguration.cpp.

Change-Id: Ic24d99927254e8d16decea49b880a2446bf322e6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2023-02-08 20:23:54 +01:00
parent 3d57b1868b
commit 3023b6ab03
7 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gerrit/authenticationdialog.h
View File

@@ -19,8 +19,6 @@ class GerritServer;
class AuthenticationDialog : public QDialog
{
Q_DECLARE_TR_FUNCTIONS(Gerrit::Internal::AuthenticationDialog)
public:
AuthenticationDialog(GerritServer *server);
~AuthenticationDialog() override;

7
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -28,6 +28,7 @@
#include <projectexplorer/makestep.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorertr.h>
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h>
@@ -689,7 +690,7 @@ static BuildInfo createBuildInfo(const Kit *k, const FilePath &projectPath,
if (type == BuildConfiguration::Release) {
//: The name of the release build configuration created by default for a qmake project.
info.displayName = BuildConfigurationTr::tr("Release");
info.displayName = ::ProjectExplorer::Tr::tr("Release");
//: Non-ASCII characters in directory suffix may cause build issues.
suffix = Tr::tr("Release", "Shadow build directory suffix");
if (settings.qtQuickCompiler.value() == TriState::Default) {
@@ -699,12 +700,12 @@ static BuildInfo createBuildInfo(const Kit *k, const FilePath &projectPath,
} else {
if (type == BuildConfiguration::Debug) {
//: The name of the debug build configuration created by default for a qmake project.
info.displayName = BuildConfigurationTr::tr("Debug");
info.displayName = ::ProjectExplorer::Tr::tr("Debug");
//: Non-ASCII characters in directory suffix may cause build issues.
suffix = Tr::tr("Debug", "Shadow build directory suffix");
} else if (type == BuildConfiguration::Profile) {
//: The name of the profile build configuration created by default for a qmake project.
info.displayName = BuildConfigurationTr::tr("Profile");
info.displayName = ::ProjectExplorer::Tr::tr("Profile");
//: Non-ASCII characters in directory suffix may cause build issues.
suffix = Tr::tr("Profile", "Shadow build directory suffix");
if (settings.separateDebugInfo.value() == TriState::Default)

5
src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h
View File

@@ -12,9 +12,4 @@ struct Tr
Q_DECLARE_TR_FUNCTIONS(::QmakeProjectManager)
};
struct BuildConfigurationTr
{
Q_DECLARE_TR_FUNCTIONS(::BuildConfiguration)
};
} // namespace QmakeProjectManager

2
src/plugins/qmljseditor/qmljshoverhandler.h
View File

@@ -24,8 +24,6 @@ class QmlJSEditorWidget;
class QMLJSEDITOR_EXPORT QmlJSHoverHandler : public TextEditor::BaseHoverHandler
{
Q_DECLARE_TR_FUNCTIONS(QmlJSHoverHandler)
public:
QmlJSHoverHandler();

2
src/plugins/qmljseditor/qmljsquickfixes.cpp
View File

@@ -105,8 +105,6 @@ class AnalysizeMessageSuppressionOperation: public QmlJSQuickFixOperation
{
StaticAnalysis::Message _message;
Q_DECLARE_TR_FUNCTIONS(AddAnalysisMessageSuppressionComment)
public:
AnalysizeMessageSuppressionOperation(const Internal::QmlJSQuickFixAssistInterface *interface,
const StaticAnalysis::Message &message)

2
src/plugins/qmljseditor/qmljswrapinloader.cpp
View File

@@ -62,8 +62,6 @@ protected:
template <typename T>
class Operation: public QmlJSQuickFixOperation
{
Q_DECLARE_TR_FUNCTIONS(QmlJSEditor::Internal::Operation)
T *m_objDef;
public:

1
src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
View File

@@ -54,7 +54,6 @@ private:
class QmlProfilerEventStorage : public Timeline::TraceEventStorage
{
Q_DECLARE_TR_FUNCTIONS(QmlProfilerEventStorage)
public:
using ErrorHandler = std::function<void(const QString &)>;