From 810d77181de6408d54fd3a07964317d4866c732d Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Tue, 18 Jul 2017 09:59:30 +0200 Subject: Replace assert() with SWIFT_LOG_ASSERT for loading fonts Test-Information: Builds on macOS 10.12.5 with Qt 5.4.2. Change-Id: Ifc49064c6a8ca2f0be52d8ddd8f0c7791230430f diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 7b4e2c3..67fc659 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -214,7 +214,7 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa for (auto&& fontName : fontNames) { std::string fontPath = std::string(":/") + fontName; int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath)); - assert((error != -1) && "Failed to load font."); + SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath << std::endl; } bool enableAdHocCommandOnJID = options.count("enable-jid-adhocs") > 0; -- cgit v0.10.2-6-g49f6