From kde-commits  Thu Nov 13 22:31:29 2008
From: Kevin Ottens <ervin () kde ! org>
Date: Thu, 13 Nov 2008 22:31:29 +0000
To: kde-commits
Subject: KDE/kdelibs/solid
Message-Id: <1226615489.724262.16289.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=122661550322425

SVN commit 883968 by ervin:

Avoid crashing when quitting in a multi-threaded context.


 M  +2 -1      solid/devicemanager_p.h  
 M  +18 -0     tests/CMakeLists.txt  
 A             tests/solidmttest.cpp   [License: LGPL (v2)]


--- trunk/KDE/kdelibs/solid/solid/devicemanager_p.h #883967:883968
@@ -25,6 +25,7 @@
 #include "devicenotifier.h"
 
 #include <QtCore/QMap>
+#include <QtCore/QPointer>
 #include <QtCore/QSharedData>
 
 namespace Solid
@@ -54,7 +55,7 @@
         Ifaces::Device *createBackendObject(const QString &udi);
 
         QExplicitlySharedDataPointer<DevicePrivate> m_nullDevice;
-        QMap<QString, DevicePrivate *> m_devicesMap;
+        QMap<QString, QPointer<DevicePrivate> > m_devicesMap;
         QMap<QObject *, QString> m_reverseMap;
     };
 }
--- trunk/KDE/kdelibs/solid/tests/CMakeLists.txt #883967:883968
@@ -48,6 +48,24 @@
 
 target_link_libraries(solidhwtest ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBS} solid_static)
 
+########### solidmttest ###############
+
+set(solidmttest_SRCS 
+   solidmttest.cpp )
+
+
+kde4_add_unit_test(solidmttest ${solidmttest_SRCS})
+add_definitions(-DFAKE_COMPUTER_XML="\\"${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw/fakecomputer.xml\\"")
+
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../solid/backends/fakehw )
+
+if(WIN32)
+  set_target_properties(solidmttest PROPERTIES COMPILE_FLAGS -DSOLID_EXPORT=)
+  set (LIBS ${KDEWIN32_LIBRARIES})
+endif(WIN32)
+
+target_link_libraries(solidmttest ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBS} solid_static)
+
 ########### solidnettestdbusservice ###############
 
 #set(solidnettestdbusservice_SRCS