Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dtk
dtk
Commits
f91a1f35
Commit
f91a1f35
authored
Jul 06, 2016
by
NICLAUSSE Nicolas
Browse files
fix plugin deps check version. + handle version arg without patch level
parent
ef63402e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/dtkCore/dtkCore.h
View file @
f91a1f35
...
...
@@ -117,6 +117,10 @@ inline bool checkVersion(const QString ref_version, const QString elem_version)
if
(
ve_ref_list
.
at
(
1
).
toInt
()
<
ve_elem_list
.
at
(
1
).
toInt
())
return
false
;
else
{
// no patch level specified in ref
if
(
ve_ref_list
.
size
()
<
3
||
ve_elem_list
.
size
()
<
3
)
{
return
true
;
}
//if same minor level, compare patch level
if
((
ve_ref_list
.
at
(
1
).
toInt
()
==
ve_elem_list
.
at
(
1
).
toInt
())
&&
(
ve_ref_list
.
at
(
2
).
toInt
()
<
ve_elem_list
.
at
(
2
).
toInt
()))
...
...
src/dtkCore/dtkCorePluginManager.tpp
View file @
f91a1f35
...
...
@@ -87,7 +87,7 @@ template <typename T> bool dtkCorePluginManagerPrivate<T>::check(const QString&
continue
;
}
if
(
checkVersion
(
ve_mitem
.
toString
(),
dtkCorePluginManagerBase
::
instance
()
->
version
(
key
).
toString
()))
{
if
(
!
checkVersion
(
dtkCorePluginManagerBase
::
instance
()
->
version
(
key
).
toString
()
,
ve_mitem
.
toString
()
))
{
dtkWarn
()
<<
" Version mismatch:"
<<
na_mitem
.
toString
()
<<
"version"
<<
dtkCorePluginManagerBase
::
instance
()
->
version
(
key
).
toString
()
<<
"but"
<<
ve_mitem
.
toString
()
<<
"required for plugin"
<<
path
;
status
=
false
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment