Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.0 on 2022-01-18 at 14:00 UTC+1 (a few minutes of down time)

Commit e74222d5 authored by vlad_burin's avatar vlad_burin
Browse files

Manual editing of conflicting files before merging

--HG--
branch : MockCompsTest
parent 718e844493e9
......@@ -5,6 +5,7 @@
#-------------------------------------------------
QT -= gui
QT += network
TARGET = rdk.static.qt
TEMPLATE = lib
......@@ -12,6 +13,11 @@ CONFIG += staticlib
include(RdkDefines.pri)
contains(DEFINES, RDK_USE_SQL)
{
QT += sql
}
#DEFINES += LIBRDK_LIBRARY_EXPORT
#DEFINES += RDK_UNICODE_RUN
#DEFINES += RDK_QT
......@@ -142,13 +148,12 @@ SOURCES += \
../../../Core/Application/UServerControl.cpp \
../../../Core/Application/UServerTransport.cpp \
../../../Core/Application/UServerTransportTcp.cpp \
../../../Core/Application/Qt/UServerTransportTcpQt.cpp \
../../../Core/Application/UTestManager.cpp \
../../../Core/System/Gcc/pevents.cpp \
../../../Core/Engine/UComponentFactory.cpp \
../../../Deploy/Include/rdk_version.cpp \
../../../Core/Application/UProjectDeployer.cpp \
../../../Core/Application/Qt/UProjectDeployerQt.cpp \
../../../Core/Application/UServerTransportHttp.cpp \
../../../Core/Application/UServerTransportHttp.cpp
HEADERS +=\
......@@ -272,15 +277,23 @@ HEADERS +=\
../../../Core/Application/UServerControl.h \
../../../Core/Application/UServerTransport.h \
../../../Core/Application/UServerTransportTcp.h \
../../../Core/Application/Qt/UServerTransportTcpQt.h \
../../../Core/Application/UTestManager.h \
../../../Core/System/Gcc/pevents.h \
../../../Core/Engine/UComponentFactory.h \
../../../Deploy/Include/rdk_version.h \
../../../Core/Application/UProjectDeployer.h \
../../../Core/Application/Qt/UProjectDeployerQt.h \
../../../Core/Application/UServerTransportHttp.h \
../../../Core/Application/UServerTransportHttp.h
contains(DEFINES, RDK_USE_SQL)
{
SOURCES += \
../../../Core/Application/Qt/UProjectDeployerQt.cpp # \
HEADERS +=\
../../../Core/Application/Qt/UProjectDeployerQt.h # \
}
unix {
DESTDIR = $$PWD/../../../../Bin/Platform/Linux/Lib.Qt
}
......
......@@ -24,7 +24,9 @@
#include "UTableInfo.h"
#include "UWatchFormWidget.h"
#include"UWatch.h"
#include "UTcpServerControlWidget.h"
//////////////////////////
#include "UCurlFtpClientTestWidget.h"
//#include "UVideoAnalyticsSimpleSettingsWidget.h"
namespace Ui {
......@@ -77,6 +79,9 @@ public:
///
void showChannelsWidget(void);
/// ( )
void loadProjectExternal(const QString &config_path);
//void setExternVideoAnalyticsSimpleWidget(UVideoAnalyticsSimpleSettingsWidget *externalWidget);
signals:
......@@ -130,10 +135,12 @@ public slots:
void actionChannelsControl();
void actionLogger();
void actionTestCreator();
void actionWatchWindow();///<-----------
void actionWatchWindow();
void actionNewWatches();
void actionProfiling();
void actionTcpServer();
//void actionVASimpleSettings();
void actionFtpTest();
private slots:
void on_mdiArea_destroyed(QObject *arg1);
......@@ -162,7 +169,10 @@ private:
UWatchFormWidget *watchFormWidget;
UTableInfo *profilingWindowWidget;
UWatch *watchWindow;
QMainWindow *tcpServerControlWindow;
UTcpServerControlWidget *tcpServerControlWidget;
//UVideoAnalyticsSimpleSettingsWidget *videoAnalyticsSimpleWidget;
UCurlFtpClientTestWidget *curlFtpClientTestWidget;
///
std::vector<USubTabDescriptionImages> imagesVector;
......
......@@ -163,6 +163,7 @@
<addaction name="menuBroadcasters"/>
<addaction name="actionServerControl"/>
<addaction name="actionTcpServer"/>
<addaction name="actionFtpTest"/>
</widget>
<widget class="QMenu" name="menuNewWindow">
<property name="title">
......@@ -706,6 +707,11 @@
<string>Build Mode 3 (Mock -&gt; RT)</string>
</property>
</action>
<action name="actionFtpTest">
<property name="text">
<string>Ftp Test</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment