forked from qt-creator/qt-creator
Translations: Remove stray Q_DECLARE_TR_FUNCTIONS(...)
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:
@@ -19,8 +19,6 @@ class GerritServer;
|
|||||||
|
|
||||||
class AuthenticationDialog : public QDialog
|
class AuthenticationDialog : public QDialog
|
||||||
{
|
{
|
||||||
Q_DECLARE_TR_FUNCTIONS(Gerrit::Internal::AuthenticationDialog)
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AuthenticationDialog(GerritServer *server);
|
AuthenticationDialog(GerritServer *server);
|
||||||
~AuthenticationDialog() override;
|
~AuthenticationDialog() override;
|
||||||
|
|||||||
@@ -28,6 +28,7 @@
|
|||||||
#include <projectexplorer/makestep.h>
|
#include <projectexplorer/makestep.h>
|
||||||
#include <projectexplorer/projectexplorer.h>
|
#include <projectexplorer/projectexplorer.h>
|
||||||
#include <projectexplorer/projectexplorerconstants.h>
|
#include <projectexplorer/projectexplorerconstants.h>
|
||||||
|
#include <projectexplorer/projectexplorertr.h>
|
||||||
#include <projectexplorer/runconfiguration.h>
|
#include <projectexplorer/runconfiguration.h>
|
||||||
#include <projectexplorer/target.h>
|
#include <projectexplorer/target.h>
|
||||||
#include <projectexplorer/toolchain.h>
|
#include <projectexplorer/toolchain.h>
|
||||||
@@ -689,7 +690,7 @@ static BuildInfo createBuildInfo(const Kit *k, const FilePath &projectPath,
|
|||||||
|
|
||||||
if (type == BuildConfiguration::Release) {
|
if (type == BuildConfiguration::Release) {
|
||||||
//: The name of the release build configuration created by default for a qmake project.
|
//: 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.
|
//: Non-ASCII characters in directory suffix may cause build issues.
|
||||||
suffix = Tr::tr("Release", "Shadow build directory suffix");
|
suffix = Tr::tr("Release", "Shadow build directory suffix");
|
||||||
if (settings.qtQuickCompiler.value() == TriState::Default) {
|
if (settings.qtQuickCompiler.value() == TriState::Default) {
|
||||||
@@ -699,12 +700,12 @@ static BuildInfo createBuildInfo(const Kit *k, const FilePath &projectPath,
|
|||||||
} else {
|
} else {
|
||||||
if (type == BuildConfiguration::Debug) {
|
if (type == BuildConfiguration::Debug) {
|
||||||
//: The name of the debug build configuration created by default for a qmake project.
|
//: 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.
|
//: Non-ASCII characters in directory suffix may cause build issues.
|
||||||
suffix = Tr::tr("Debug", "Shadow build directory suffix");
|
suffix = Tr::tr("Debug", "Shadow build directory suffix");
|
||||||
} else if (type == BuildConfiguration::Profile) {
|
} else if (type == BuildConfiguration::Profile) {
|
||||||
//: The name of the profile build configuration created by default for a qmake project.
|
//: 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.
|
//: Non-ASCII characters in directory suffix may cause build issues.
|
||||||
suffix = Tr::tr("Profile", "Shadow build directory suffix");
|
suffix = Tr::tr("Profile", "Shadow build directory suffix");
|
||||||
if (settings.separateDebugInfo.value() == TriState::Default)
|
if (settings.separateDebugInfo.value() == TriState::Default)
|
||||||
|
|||||||
@@ -12,9 +12,4 @@ struct Tr
|
|||||||
Q_DECLARE_TR_FUNCTIONS(::QmakeProjectManager)
|
Q_DECLARE_TR_FUNCTIONS(::QmakeProjectManager)
|
||||||
};
|
};
|
||||||
|
|
||||||
struct BuildConfigurationTr
|
|
||||||
{
|
|
||||||
Q_DECLARE_TR_FUNCTIONS(::BuildConfiguration)
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace QmakeProjectManager
|
} // namespace QmakeProjectManager
|
||||||
|
|||||||
@@ -24,8 +24,6 @@ class QmlJSEditorWidget;
|
|||||||
|
|
||||||
class QMLJSEDITOR_EXPORT QmlJSHoverHandler : public TextEditor::BaseHoverHandler
|
class QMLJSEDITOR_EXPORT QmlJSHoverHandler : public TextEditor::BaseHoverHandler
|
||||||
{
|
{
|
||||||
Q_DECLARE_TR_FUNCTIONS(QmlJSHoverHandler)
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
QmlJSHoverHandler();
|
QmlJSHoverHandler();
|
||||||
|
|
||||||
|
|||||||
@@ -105,8 +105,6 @@ class AnalysizeMessageSuppressionOperation: public QmlJSQuickFixOperation
|
|||||||
{
|
{
|
||||||
StaticAnalysis::Message _message;
|
StaticAnalysis::Message _message;
|
||||||
|
|
||||||
Q_DECLARE_TR_FUNCTIONS(AddAnalysisMessageSuppressionComment)
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AnalysizeMessageSuppressionOperation(const Internal::QmlJSQuickFixAssistInterface *interface,
|
AnalysizeMessageSuppressionOperation(const Internal::QmlJSQuickFixAssistInterface *interface,
|
||||||
const StaticAnalysis::Message &message)
|
const StaticAnalysis::Message &message)
|
||||||
|
|||||||
@@ -62,8 +62,6 @@ protected:
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
class Operation: public QmlJSQuickFixOperation
|
class Operation: public QmlJSQuickFixOperation
|
||||||
{
|
{
|
||||||
Q_DECLARE_TR_FUNCTIONS(QmlJSEditor::Internal::Operation)
|
|
||||||
|
|
||||||
T *m_objDef;
|
T *m_objDef;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|||||||
@@ -54,7 +54,6 @@ private:
|
|||||||
|
|
||||||
class QmlProfilerEventStorage : public Timeline::TraceEventStorage
|
class QmlProfilerEventStorage : public Timeline::TraceEventStorage
|
||||||
{
|
{
|
||||||
Q_DECLARE_TR_FUNCTIONS(QmlProfilerEventStorage)
|
|
||||||
public:
|
public:
|
||||||
using ErrorHandler = std::function<void(const QString &)>;
|
using ErrorHandler = std::function<void(const QString &)>;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user