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
Commits
35f62138
Unverified
Commit
35f62138
authored
1 year ago
by
Burak Hançerli
Browse files
Options
Downloads
Patches
Plain Diff
fix: remove unnecessary string-number conversions
parent
761d3487
No related branches found
No related tags found
1 merge request
!22
QDS-11332 Implement better qmlproject handling
Pipeline
#64608
passed
1 year ago
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
android/AndroidManifest.xml
+1
-1
1 addition, 1 deletion
android/AndroidManifest.xml
src/projectManager.cpp
+2
-2
2 additions, 2 deletions
src/projectManager.cpp
ui/main.qml
+1
-1
1 addition, 1 deletion
ui/main.qml
with
4 additions
and
4 deletions
android/AndroidManifest.xml
+
1
−
1
View file @
35f62138
<?xml version="1.0"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"io.qt.qtuiviewer"
android:installLocation=
"auto"
android:versionCode=
"1
5
"
android:versionName=
"1.2"
>
android:installLocation=
"auto"
android:versionCode=
"1
6
"
android:versionName=
"1.2"
>
<!-- %%INSERT_PERMISSIONS -->
<!-- %%INSERT_FEATURES -->
<supports-screens
android:anyDensity=
"true"
android:largeScreens=
"true"
...
...
This diff is collapsed.
Click to expand it.
src/projectManager.cpp
+
2
−
2
View file @
35f62138
...
...
@@ -88,7 +88,7 @@ QString ProjectManager::unpackProject(const QByteArray &project, bool extractZip
const
uchar
*
data
;
if
(
m_projectData
.
size
())
{
qDebug
()
<<
"Unregistering the previous data from QRC system. Path: "
<<
m_projectPath
<<
" Size: "
<<
QString
::
number
(
m_projectData
.
size
()
)
<<
" bytes."
;
<<
" Size: "
<<
m_projectData
.
size
()
<<
" bytes."
;
data
=
reinterpret_cast
<
const
uchar
*>
(
m_projectData
.
data
());
if
(
!
QResource
::
unregisterResource
(
data
,
m_projectPath
))
{
qCritical
(
"Cannot unregister the previous resource data."
);
...
...
@@ -97,7 +97,7 @@ QString ProjectManager::unpackProject(const QByteArray &project, bool extractZip
m_projectData
=
project
;
data
=
reinterpret_cast
<
const
uchar
*>
(
m_projectData
.
data
());
qDebug
()
<<
"Registering resource data. Size: "
<<
QString
::
number
(
m_projectData
.
size
()
)
;
qDebug
()
<<
"Registering resource data. Size: "
<<
m_projectData
.
size
();
const
QString
resourcePath
{
"/"
+
QString
::
number
(
QRandomGenerator
::
global
()
->
generate
())};
m_projectPath
=
resourcePath
;
...
...
This diff is collapsed.
Click to expand it.
ui/main.qml
+
1
−
1
View file @
35f62138
...
...
@@ -183,7 +183,6 @@ Rectangle {
Layout.fillWidth
:
true
checkable
:
true
autoExclusive
:
true
Connections
{
target
:
logs
function
onClicked
(){
...
...
@@ -198,6 +197,7 @@ Rectangle {
Layout.fillWidth
:
true
checkable
:
true
autoExclusive
:
true
visible
:
false
;
Connections
{
target
:
network
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment