forked from blue/squawk
Fixing build without omemo, release preparation, unnecessary inheritance removed, info widget fix
This commit is contained in:
parent
829777935f
commit
acd60eaba2
13 changed files with 92 additions and 40 deletions
|
@ -24,7 +24,7 @@
|
|||
#ifdef WITH_OMEMO
|
||||
constexpr bool OMEMO_SUPPORT = true;
|
||||
#else
|
||||
constexpr bool OMEMO_SUPPORT = false
|
||||
constexpr bool OMEMO_SUPPORT = false;
|
||||
#endif
|
||||
|
||||
QFont getFont (QFontDatabase::SystemFont type, bool bold = false, bool italic = false, qreal factor = 1.0) {
|
||||
|
|
|
@ -31,7 +31,7 @@ namespace Shared {
|
|||
*
|
||||
* under development yet
|
||||
*/
|
||||
class Info : public QObject, public VCard {
|
||||
class Info {
|
||||
public:
|
||||
Info ();
|
||||
Info (const QString& address, EntryType = EntryType::none);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue