Merge story/release-validation-scope
Bring the validation-scope line (in-tree Jenkins CI copy, lcov coverage wiring, step-by-step release-scope README, TetraIF unit tests, the LogView runtime icon/resource fix, Dockerfile, rpmbuild and the new_docker_build.sh driver with the DEB output path) on top of the XmlPatterns branch pruned to the Release 2 scope. Conflict policy: - Out-of-scope targets/modules: keep the prune (deletion wins). - In-scope files that validation had deleted: restored from story/release-2-cleanup (the Release 2 closure, with the pruned-module guards). - In-scope sources carrying migration work: XmlPatterns versions (Qt XmlPatterns rework on QDomDocument, DDS member and logger fixes, first-build fixes). - Scope-aware CMakeLists (top level, PluginInterfaces, LtsWidgets) and .envrc: story/release-2-cleanup / ours versions.
This commit is contained in:
commit
cfe15c72c4
521 files changed
+37159
-36635
No files matched your search
@@ -13,7 +13,7 @@ int main(int argc, char **argv)
|
||||
{
|
||||
QCoreApplication app(argc, argv);
|
||||
|
||||
|
||||
// Check alle 30 Sekunden
|
||||
NGL::NGLLoggerBootstrap::createNGLRootLogger("log4cxx_tetra.props", false);
|
||||
|
||||
NGL::INGLLogger &logger(NGL::NGLLoggerBootstrap::getNGLRootLogger());
|
||||
@@ -41,9 +41,7 @@ int main(int argc, char **argv)
|
||||
TetraIF::usage();
|
||||
}
|
||||
const QString mode = args[3].toLower();
|
||||
if (mode != QLatin1String("listen") &&
|
||||
mode != QLatin1String("send_random") &&
|
||||
mode != QLatin1String("send_file"))
|
||||
if (mode != QLatin1String("listen") && mode != QLatin1String("send_random") && mode != QLatin1String("send_file"))
|
||||
{
|
||||
ERROR_LOG(logger) << "Invalid mode " << args[3];
|
||||
TetraIF::usage();
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
|
||||
|
||||
/**
|
||||
* Tetra-Interface für Lasttest
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#pragma once
|
||||
#include <QtCore/QObject>
|
||||
#include <QtNetwork/QHostAddress>
|
||||
@@ -28,8 +32,9 @@ protected Q_SLOTS:
|
||||
void onReadyRead();
|
||||
void onError(QAbstractSocket::SocketError);
|
||||
void onSendData();
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
NGL::INGLLogger &m_logger;
|
||||
void doInitialLogin();
|
||||
void handleReceivedTelegram(const QByteArray &data);
|
||||
void handleRegisterRsp(const uint8_t a_registrationStatus);
|
||||
|
||||
Reference in new issue
Block a user