Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GR Build Images
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ingo Meyer
GR Build Images
Commits
dd205024
Commit
dd205024
authored
2 years ago
by
Ingo Meyer
Browse files
Options
Downloads
Patches
Plain Diff
Use the latest Qt 5.15.2 in Windows cross compiling images
parent
ed65530c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
windows-32bit-cross/Dockerfile
+5
-1
5 additions, 1 deletion
windows-32bit-cross/Dockerfile
windows-64bit-cross/Dockerfile
+5
-1
5 additions, 1 deletion
windows-64bit-cross/Dockerfile
with
10 additions
and
2 deletions
windows-32bit-cross/Dockerfile
+
5
−
1
View file @
dd205024
...
...
@@ -2,5 +2,9 @@ FROM debian:10
RUN
apt-get update
&&
\
apt-get dist-upgrade
-y
&&
\
apt-get
install
-y
wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git
qtbase5-dev-tools qt5-default
&&
\
apt-get
install
-y
wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git
&&
\
rm
-rf
/var/lib/apt/lists/
*
RUN
wget
"https://gr-framework.org/downloads/3rdparty/qt5.15.2-linux-x86_64-bin.tar.gz"
&&
\
tar
-C
/usr/local
--strip-components
=
1
-xvf
"qt5.15.2-linux-x86_64-bin.tar.gz"
&&
\
rm
-rf
"qt5.15.2-linux-x86_64-bin.tar.gz"
This diff is collapsed.
Click to expand it.
windows-64bit-cross/Dockerfile
+
5
−
1
View file @
dd205024
...
...
@@ -2,5 +2,9 @@ FROM debian:10
RUN
apt-get update
&&
\
apt-get dist-upgrade
-y
&&
\
apt-get
install
-y
wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git
qtbase5-dev-tools qt5-default
&&
\
apt-get
install
-y
wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git
&&
\
rm
-rf
/var/lib/apt/lists/
*
RUN
wget
"https://gr-framework.org/downloads/3rdparty/qt5.15.2-linux-x86_64-bin.tar.gz"
&&
\
tar
-C
/usr/local
--strip-components
=
1
-xvf
"qt5.15.2-linux-x86_64-bin.tar.gz"
&&
\
rm
-rf
"qt5.15.2-linux-x86_64-bin.tar.gz"
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