Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Qt UI Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Design Studio
QML Viewer Projects
Qt UI Viewer
Merge requests
!35
QDS-11904
Update strings in the UI according to the documentation standards
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
QDS-11904
Update strings in the UI according to the documentation standards
QDS-11904/update-strings
into
master
Overview
3
Commits
4
Pipelines
3
Changes
4
All threads resolved!
Hide all comments
Merged
Burak Hançerli
requested to merge
QDS-11904/update-strings
into
master
1 year ago
Overview
3
Commits
4
Pipelines
3
Changes
4
All threads resolved!
Hide all comments
Expand
0
0
Merge request reports
Compare
master
version 2
9b2976ac
1 year ago
version 1
c4cf6607
1 year ago
master (base)
and
latest version
latest version
fbbd60df
4 commits,
1 year ago
version 2
9b2976ac
3 commits,
1 year ago
version 1
c4cf6607
2 commits,
1 year ago
4 files
+
13
−
7
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
src/dsConnector.cpp
+
2
−
2
Options
@@ -73,14 +73,14 @@ void DesignStudioConnector::initTcpServer()
qDebug
()
<<
"Listening on port "
<<
m_tcpPort
;
connect
(
&
m_tcpServer
,
&
QTcpServer
::
newConnection
,
this
,
[
this
]()
{
qDebug
()
<<
"New connection from Design Studio"
;
emit
networkStatusUpdated
(
"Design Studio is connected.
\n
Waiting for project..."
);
emit
networkStatusUpdated
(
"
Qt
Design Studio is connected.
\n
Waiting for project..."
);
m_tcpSocket
.
reset
(
m_tcpServer
.
nextPendingConnection
());
m_ipUpdateTimer
.
stop
();
connect
(
m_tcpSocket
.
data
(),
&
QTcpSocket
::
disconnected
,
this
,
[
this
]()
{
qDebug
()
<<
"Disconnected from Design Studio"
;
emit
networkStatusUpdated
(
"
\n
Local IP: "
+
m_ipv4Addr
+
"
\n
Waiting for Design Studio to connect..."
);
+
"
\n
Waiting for
Qt
Design Studio to connect..."
);
m_projectData
.
clear
();
m_ipUpdateTimer
.
start
();
});
Loading