From f11617152df3e8f11abd930b52afe917b9733e5d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 20 Jul 2016 23:30:22 +0300 Subject: [PATCH] remove QT_MOC_CPP definition check [ci skip] Signed-off-by: Ivailo Monev --- TODO | 1 - src/core/thread/qthreadstorage.h | 7 ------- 2 files changed, 8 deletions(-) diff --git a/TODO b/TODO index cea6663b6..885191c22 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,4 @@ use system harfbuzz and clucene (optionally) and unbundle -QT_MOC_CPP seems unused but checked for in two headers QCache must implement begin() and end() for qDeleteAll() Also: https://github.com/fluxer/katie/issues diff --git a/src/core/thread/qthreadstorage.h b/src/core/thread/qthreadstorage.h index 34e76b81c..2185d8595 100644 --- a/src/core/thread/qthreadstorage.h +++ b/src/core/thread/qthreadstorage.h @@ -64,9 +64,6 @@ public: int id; }; -#if !defined(QT_MOC_CPP) -// MOC_SKIP_BEGIN - // pointer specialization template inline @@ -123,10 +120,6 @@ inline void qThreadStorage_deleteData(void *d, T *) { delete static_cast(d); } - -// MOC_SKIP_END -#endif - template class QThreadStorage { -- 2.11.0