OSDN Git Service
(root)
/
alterlinux
/
alterlinux-calamares.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
058e6cb
)
[calamares] Test-loader tries loading from install-dir, too
author
Adriaan de Groot
<groot@kde.org>
Mon, 27 Sep 2021 11:39:27 +0000
(13:39 +0200)
committer
Adriaan de Groot
<groot@kde.org>
Mon, 27 Sep 2021 11:39:27 +0000
(13:39 +0200)
src/calamares/testmain.cpp
patch
|
blob
|
history
diff --git
a/src/calamares/testmain.cpp
b/src/calamares/testmain.cpp
index
c0258eb
..
1d6971e
100644
(file)
--- a/
src/calamares/testmain.cpp
+++ b/
src/calamares/testmain.cpp
@@
-298,7
+298,7
@@
load_module( const ModuleConfig& moduleConfig )
bool ok = false;
QVariantMap descriptor;
- QStringList moduleDirectories { "./", "src/modules/", "modules/" };
+ QStringList moduleDirectories { "./", "src/modules/", "modules/"
, CMAKE_INSTALL_FULL_LIBDIR "/calamares/modules/"
};
for ( const QString& prefix : qAsConst( moduleDirectories ) )
{
// Could be a complete path, eg. src/modules/dummycpp/module.desc