diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-12-29 17:11:24 +0100 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-08-17 00:34:36 +0000 |
| commit | 0a06e1baf9e6da5308582b9dc928f4d9fea508d0 (patch) | |
| tree | 187be725390515db55f56e5f2cdebad60ee183f8 /src/platformsupport | |
| parent | 815153d4a453855bb528f0fa9cb7e5a77d589a11 (diff) | |
Modernize the "thread" feature
Add it to configure.json and replace all occurrences of QT_NO_THREAD
with QT_CONFIG(thread). Add conditions for other features that depend
on thread support. Remove conditions where we can use the QMutex and
QThreadStorage stubs.
Change-Id: I284e5d794fda9a4c6f4a1ab29e55aa686272a0eb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/platformsupport')
3 files changed, 0 insertions, 26 deletions
diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp index 7438ab65c1..44258538ec 100644 --- a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp +++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp @@ -43,14 +43,9 @@ #include "private/qguiapplication_p.h" #include <qpa/qwindowsysteminterface.h> -#include <QtCore/QElapsedTimer> -#include <QtCore/QAtomicInt> -#include <QtCore/QSemaphore> #include <QtCore/QDebug> -#include <errno.h> - QT_BEGIN_NAMESPACE QT_USE_NAMESPACE diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp index dabe2bc09e..7b4f6aa107 100644 --- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp +++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp @@ -139,14 +139,6 @@ QtFreetypeData::~QtFreetypeData() library = 0; } -#ifdef QT_NO_THREAD -Q_GLOBAL_STATIC(QtFreetypeData, theFreetypeData) - -QtFreetypeData *qt_getFreetypeData() -{ - return theFreetypeData(); -} -#else Q_GLOBAL_STATIC(QThreadStorage<QtFreetypeData *>, theFreetypeData) QtFreetypeData *qt_getFreetypeData() @@ -169,7 +161,6 @@ QtFreetypeData *qt_getFreetypeData() } return freetypeData; } -#endif FT_Library qt_getFreetype() { diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp index 8df8da1a38..953e2bf6be 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp @@ -1231,7 +1231,6 @@ void QWindowsFontDatabase::populateFontDatabase() typedef QSharedPointer<QWindowsFontEngineData> QWindowsFontEngineDataPtr; -#ifndef QT_NO_THREAD typedef QThreadStorage<QWindowsFontEngineDataPtr> FontEngineThreadLocalData; Q_GLOBAL_STATIC(FontEngineThreadLocalData, fontEngineThreadLocalData) @@ -1243,17 +1242,6 @@ QSharedPointer<QWindowsFontEngineData> sharedFontData() data->setLocalData(QSharedPointer<QWindowsFontEngineData>::create()); return data->localData(); } -#else // !QT_NO_THREAD -Q_GLOBAL_STATIC(QWindowsFontEngineDataPtr, fontEngineData) - -QWindowsFontEngineDataPtr sharedFontData() -{ - QWindowsFontEngineDataPtr *data = fontEngineData(); - if (data->isNull()) - *data = QWindowsFontEngineDataPtr::create(); - return *data; -} -#endif // QT_NO_THREAD QWindowsFontDatabase::QWindowsFontDatabase() { |