From 323dd162f5326b998e1c92ab4cfec8a63574023f Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 24 Dec 2018 22:45:38 +0100
Subject: cmake: decruft, disable deprecated Qt functions
---
compat/run-in-thread.hpp | 4 ++--
compat/timer.cpp | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'compat')
diff --git a/compat/run-in-thread.hpp b/compat/run-in-thread.hpp
index afe279f2..6aadab45 100644
--- a/compat/run-in-thread.hpp
+++ b/compat/run-in-thread.hpp
@@ -108,8 +108,8 @@ template<typename F>
void run_in_thread_async(QObject* obj, F&& fun)
{
QObject src;
- QThread* t(obj->thread());
- assert(t);
+ QThread* t = obj->thread();
+ if (!t) abort();
src.moveToThread(t);
QObject::connect(&src, &QObject::destroyed, obj, std::move(fun), Qt::AutoConnection);
}
diff --git a/compat/timer.cpp b/compat/timer.cpp
index 15e9d8a4..b46ebe4a 100644
--- a/compat/timer.cpp
+++ b/compat/timer.cpp
@@ -6,6 +6,8 @@
* notice appear in all copies.
*/
+#undef NDEBUG
+
#include "timer.hpp"
#include <cassert>
#include <cmath>
--
cgit v1.2.3