forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-text/bibletime: backport patch from upstream solving build with Q…
…t 5.5 Package-Manager: portage-2.2.26
- Loading branch information
1 parent
1054b33
commit e3f1a50
Showing
2 changed files
with
33 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From: Gary Holmlund <[email protected]> | ||
Date: Fri, 3 Jul 2015 21:32:26 -0700 | ||
Subject: [PATCH] backend: Fix Qt 5.5 compile error with Q_ASSERT. | ||
|
||
--- | ||
src/backend/drivers/cswordmoduleinfo.cpp | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/src/backend/drivers/cswordmoduleinfo.cpp b/src/backend/drivers/cswordmoduleinfo.cpp | ||
index f86f9ac..ae7444f 100644 | ||
--- a/src/backend/drivers/cswordmoduleinfo.cpp | ||
+++ b/src/backend/drivers/cswordmoduleinfo.cpp | ||
@@ -54,7 +54,7 @@ const unsigned long BT_MAX_LUCENE_FIELD_LENGTH = 1024 * 1024; | ||
CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module, | ||
CSwordBackend & backend, | ||
ModuleType type) | ||
- : m_module((Q_ASSERT(module), module)), | ||
+ : m_module(module), | ||
m_backend(backend), | ||
m_type(type), | ||
m_cancelIndexing(false), | ||
@@ -63,6 +63,7 @@ CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module, | ||
{ | ||
initCachedCategory(); | ||
initCachedLanguage(); | ||
+ Q_ASSERT(module); | ||
|
||
m_hidden = btConfig().value<QStringList>("state/hiddenModules", | ||
QStringList()).contains(m_cachedName); | ||
-- | ||
2.4.10 | ||
|