diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-01-29 20:32:22 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 22:23:55 +0100 |
| commit | b69bb01f11f5104d8e807c7a2bdc92d3ffa394b4 (patch) | |
| tree | 1f363f3922a4e51287bd0e6eac1b1f14ff2ba3b1 /src/gui/kernel/qguiapplication.cpp | |
| parent | c094891db377d750c0e8290b98971b69161a0552 (diff) | |
Use QBasicMutex instead of Q_GLOBAL_STATIC QMutex
QBasicMutex is a POD and can be used as a static global object.
in qpicture.cpp factoryLoader is used only once, and under the mutex, so
there is no need for Q_GLOBAL_STATIC for it, it can be a function static
in qhostinfo_unix.cpp the code seemed wrong while compiled with
namespace and QT_NO_GETADDRINFO. I also could get rid of one include
because it was included earlier.
Change-Id: I3c700203c3e067266c20733f4bda8031446dbb86
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 9f7bc24119..a97647f504 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -123,7 +123,7 @@ QList<QScreen *> QGuiApplicationPrivate::screen_list; QWindowList QGuiApplicationPrivate::window_list; QWindow *QGuiApplicationPrivate::focus_window = 0; -Q_GLOBAL_STATIC(QMutex, applicationFontMutex) +static QBasicMutex applicationFontMutex; QFont *QGuiApplicationPrivate::app_font = 0; extern void qRegisterGuiVariant(); @@ -1327,7 +1327,7 @@ void QGuiApplication::setPalette(const QPalette &pal) QFont QGuiApplication::font() { - QMutexLocker locker(applicationFontMutex()); + QMutexLocker locker(&applicationFontMutex); if (!QGuiApplicationPrivate::app_font) QGuiApplicationPrivate::app_font = new QFont(QGuiApplicationPrivate::platformIntegration()->fontDatabase()->defaultFont()); @@ -1336,7 +1336,7 @@ QFont QGuiApplication::font() void QGuiApplication::setFont(const QFont &font) { - QMutexLocker locker(applicationFontMutex()); + QMutexLocker locker(&applicationFontMutex); if (!QGuiApplicationPrivate::app_font) QGuiApplicationPrivate::app_font = new QFont(font); else |