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
@@ -1,16 +1,16 @@
|
||||
// **************************************************************************
|
||||
//
|
||||
// (C) Copyright 2009 Swiss SIMTEC AG
|
||||
//
|
||||
// **************************************************************************
|
||||
//
|
||||
// $HeadURL$
|
||||
// $LastChangedBy$
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
//
|
||||
// **************************************************************************
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QThread>
|
||||
@@ -24,13 +24,15 @@ namespace N_LogView
|
||||
{
|
||||
class LogViewTelegram;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @author alois.wismer
|
||||
* @version 1.0
|
||||
* @created 05-Aug-2010 16:02:15
|
||||
*/
|
||||
class LogViewInjectionThread : public QThread
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
LogViewInjectionThread();
|
||||
|
||||
void run();
|
||||
@@ -39,12 +41,15 @@ namespace N_LogView
|
||||
|
||||
bool isSendingPossible() const;
|
||||
|
||||
|
||||
|
||||
void sendTelegram(LogViewTelegram* a_telegram, const bool a_doSendAsCentralTelegram);
|
||||
/**
|
||||
*
|
||||
* @param a_telegram
|
||||
* @param a_doSendAsCentralTelegram
|
||||
*/
|
||||
void sendTelegram(LogViewTelegram *a_telegram, const bool a_doSendAsCentralTelegram);
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
bool m_DoStartConnection;
|
||||
bool m_SendingPossible;
|
||||
QString m_Hostname;
|
||||
@@ -67,10 +72,12 @@ namespace N_LogView
|
||||
|
||||
public:
|
||||
signals:
|
||||
|
||||
|
||||
void updateStatus(const QString& a_picName, const QString& a_toolTipText);
|
||||
|
||||
/**
|
||||
*
|
||||
* @param a_picName
|
||||
* @param a_toolTipText
|
||||
*/
|
||||
void updateStatus(const QString &a_picName, const QString &a_toolTipText);
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user