summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-07-18 07:59:30 (GMT)
committerTobias Markmann <tm@ayena.de>2017-07-18 07:59:30 (GMT)
commit810d77181de6408d54fd3a07964317d4866c732d (patch)
tree523e6a7f5c92a06c1da8599cf31f73f40d54edd3
parentba67437900cfabb1ce9e115c0ec5029c76696b8b (diff)
downloadswift-swift-4.x.zip
swift-swift-4.x.tar.bz2
Replace assert() with SWIFT_LOG_ASSERT for loading fontsswift-4.x
Test-Information: Builds on macOS 10.12.5 with Qt 5.4.2. Change-Id: Ifc49064c6a8ca2f0be52d8ddd8f0c7791230430f
-rw-r--r--Swift/QtUI/QtSwift.cpp2
1 files changed, 1 insertions, 1 deletions
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;