Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Qt Design 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 Design Viewer
Commits
07de8ed6
Commit
07de8ed6
authored
1 year ago
by
Burak Hançerli
Browse files
Options
Downloads
Patches
Plain Diff
Subrepo bump and version info onto the main page
parent
8e2ab623
No related branches found
No related tags found
1 merge request
!9
Subrepo bump and version info onto the main page
Pipeline
#64047
passed
1 year ago
Stage: build
Stage: release
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+6
-0
6 additions, 0 deletions
CMakeLists.txt
qtquickdesigner-components
+1
-1
1 addition, 1 deletion
qtquickdesigner-components
resources/version.json
+3
-1
3 additions, 1 deletion
resources/version.json
www/scripts/script.js
+4
-0
4 additions, 0 deletions
www/scripts/script.js
with
14 additions
and
2 deletions
CMakeLists.txt
+
6
−
0
View file @
07de8ed6
...
@@ -60,10 +60,16 @@ install(
...
@@ -60,10 +60,16 @@ install(
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
)
)
execute_process
(
COMMAND git describe --always --tags OUTPUT_VARIABLE GIT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process
(
COMMAND git describe --always --tags OUTPUT_VARIABLE GIT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process
(
COMMAND git -C
${
CMAKE_SOURCE_DIR
}
/qtquickdesigner-components describe --always --tags OUTPUT_VARIABLE QT_QUICK_COMPONENTS_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process
(
COMMAND git -C
${
CMAKE_SOURCE_DIR
}
/emsdk describe --always --tags OUTPUT_VARIABLE EMSDK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/resources/version.json
${
CMAKE_INSTALL_PREFIX
}
/resources/meta-data/version.json
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/resources/version.json
${
CMAKE_INSTALL_PREFIX
}
/resources/meta-data/version.json
)
message
(
STATUS
"GIT_VERSION:
${
GIT_VERSION
}
"
)
message
(
STATUS
"GIT_VERSION:
${
GIT_VERSION
}
"
)
message
(
STATUS
"QT_QUICK_COMPONENTS_VERSION:
${
QT_QUICK_COMPONENTS_VERSION
}
"
)
message
(
STATUS
"EMSDK_VERSION:
${
EMSDK_VERSION
}
"
)
message
(
STATUS
"QT_VERSION:
${
QT_VERSION
}
"
)
message
(
STATUS
"QT_VERSION:
${
QT_VERSION
}
"
)
set_property
(
DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
${
CMAKE_INSTALL_PREFIX
}
)
set_property
(
DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
${
CMAKE_INSTALL_PREFIX
}
)
...
...
This diff is collapsed.
Click to expand it.
qtquickdesigner-components
@
0e457477
Compare
b3f1dcf0
...
0e457477
Subproject commit
b3f1dcf0d1b46af04aafd59ceecdc9257fca0e71
Subproject commit
0e457477d54b068abc89cf124daedefe0436dd89
This diff is collapsed.
Click to expand it.
resources/version.json
+
3
−
1
View file @
07de8ed6
{
{
"appVersion"
:
"@GIT_VERSION@"
,
"appVersion"
:
"@GIT_VERSION@"
,
"qtVersion"
:
"@QT_VERSION@"
"qtVersion"
:
"@QT_VERSION@"
,
"qtQuickComponentsVersion"
:
"@QT_QUICK_COMPONENTS_VERSION@"
,
"emsdkVersion"
:
"@EMSDK_VERSION@"
}
}
This diff is collapsed.
Click to expand it.
www/scripts/script.js
+
4
−
0
View file @
07de8ed6
...
@@ -148,9 +148,13 @@ function showVersionInfo() {
...
@@ -148,9 +148,13 @@ function showVersionInfo() {
versionInfo
=
request
.
response
;
versionInfo
=
request
.
response
;
var
appVersion
=
json
.
appVersion
;
var
appVersion
=
json
.
appVersion
;
var
qtVersion
=
json
.
qtVersion
;
var
qtVersion
=
json
.
qtVersion
;
var
qtQuickComponentsVersion
=
json
.
qtQuickComponentsVersion
;
var
emsdkVersion
=
json
.
emsdkVersion
;
var
webServiceVersion
=
json
.
webServiceVersion
;
var
webServiceVersion
=
json
.
webServiceVersion
;
var
versionText
=
var
versionText
=
"
Design Viewer
"
+
appVersion
+
"
Design Viewer
"
+
appVersion
+
"
<br>Qt Quick Components
"
+
qtQuickComponentsVersion
+
"
<br>Emscripten SDK
"
+
emsdkVersion
+
"
<br>Built with Qt
"
+
qtVersion
"
<br>Built with Qt
"
+
qtVersion
document
.
querySelector
(
"
#versioninfo_main
"
).
innerHTML
=
versionText
;
document
.
querySelector
(
"
#versioninfo_main
"
).
innerHTML
=
versionText
;
};
};
...
...
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