Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules
Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
1200 files changed
+20421
-18259
No files matched your search
+14
@@ -0,0 +1,14 @@
|
||||
#pragma once
|
||||
|
||||
// Translation Helper für AlarmManagement Module
|
||||
// Wrapper für QObject::tr() in nicht-QObject Klassen
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include "svcalmcommon_export.h"
|
||||
|
||||
namespace AlarmManagement
|
||||
{
|
||||
|
||||
SVCALMCOMMON_EXPORT QString tr(const char *sourceText, const char *comment = nullptr, int n = -1);
|
||||
|
||||
} // namespace AlarmManagement
|
||||
Reference in new issue
Block a user