Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
1bd6b7e3
Commit
1bd6b7e3
authored
4 years ago
by
Albert Babí Oller
Committed by
Albert Babí Oller
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
misc: check system's qmake version
Change-Id: Icf38cabf03709802dea4e13369b70f7d584f65f8
parent
d18e01b3
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/install.sh
+14
-2
14 additions, 2 deletions
scripts/install.sh
with
14 additions
and
2 deletions
scripts/install.sh
+
14
−
2
View file @
1bd6b7e3
...
...
@@ -142,8 +142,20 @@ if [ "${client}" = "client-qt" ]; then
if
!
command
-v
qmake &> /dev/null
;
then
eval
${
qt5path
}
/bin/qmake
PREFIX
=
"
${
INSTALL
}
/
${
client
}
"
..
else
qmake
-qt
=
${
qt5ver
}
PREFIX
=
"
${
INSTALL
}
/
${
client
}
"
..
fi
# Extract installed Qt version and compare with minimum required
sys_qt5ver
=
$(
qmake
-v
)
sys_qt5ver
=
${
sys_qt5ver
#*Qt version
}
sys_qt5ver
=
${
sys_qt5ver
%\ in\ *
}
installed_qt5ver
=
$(
echo
$sys_qt5ver
|
cut
-d
'.'
-f
2
)
required_qt5ver
=
$(
echo
$qt5ver
|
cut
-d
'.'
-f
2
)
if
[[
$installed_qt5ver
-ge
$required_qt5ver
]]
;
then
qmake
PREFIX
=
"
${
INSTALL
}
/
${
client
}
"
..
else
eval
${
qt5path
}
/bin/qmake
PREFIX
=
"
${
INSTALL
}
/
${
client
}
"
..
fi
fi
else
if
[
"
${
global
}
"
=
"true"
]
;
then
if
[
"
${
prefix
+set
}
"
]
;
then
...
...
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