summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-03-27 14:24:24 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-03-27 15:45:19 (GMT)
commitc9db617cc2962ffbf76e6e6eb60a0c8a14843e52 (patch)
tree891b34005871e042c3b88ed93830ba0a3ac427e9 /src/dbus
parenta3bb85673a4bf9aa7c629ab74b483a2faaa30369 (diff)
downloadQt-c9db617cc2962ffbf76e6e6eb60a0c8a14843e52.zip
Qt-c9db617cc2962ffbf76e6e6eb60a0c8a14843e52.tar.gz
Qt-c9db617cc2962ffbf76e6e6eb60a0c8a14843e52.tar.bz2
Small fix: initialise the global static isDebugging variable within the
acquire guard of the local static. This only buys us one warning less by helgrind. Reviewed-by: Trust Me
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbusintegrator.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 91b9cb1..7ed0cd5 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -921,10 +921,9 @@ QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p)
rootNode(QString(QLatin1Char('/')))
{
static const bool threads = qDBusInitThreads();
- static const int debugging = qgetenv("QDBUS_DEBUG").toInt();
+ static const int debugging = ::isDebugging = qgetenv("QDBUS_DEBUG").toInt();
Q_UNUSED(threads)
- ::isDebugging = debugging;
#ifdef QDBUS_THREAD_DEBUG
if (debugging > 1)
qdbusThreadDebug = qdbusDefaultThreadDebug;