summaryrefslogtreecommitdiffstats
path: root/src/activeqt/control
diff options
context:
space:
mode:
authorAndy Shaw <qt-info@nokia.com>2009-06-29 15:02:20 +0200
committerAndy Shaw <qt-info@nokia.com>2009-06-29 15:02:20 +0200
commit982f73014771bbfb782d835eb8e6be3b44ff4ddc (patch)
tree037f804eb085f58fc4cd106a613237fd1409ce19 /src/activeqt/control
parent29812003b5ae8641773e0f5bd35cf2c82957088b (diff)
Remove a couple of registry entries when unregistering an ActiveX server
These two entries were not removed since the server was an OOP server Reviewed-by: Prasanth
Diffstat (limited to 'src/activeqt/control')
-rw-r--r--src/activeqt/control/qaxserver.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index c15cdace79..7ac053e2e8 100644
--- a/src/activeqt/control/qaxserver.cpp
+++ b/src/activeqt/control/qaxserver.cpp
@@ -351,6 +351,10 @@ HRESULT UpdateRegistry(BOOL bRegister)
qAxFactory()->registerClass(*key, &settings);
}
} else {
+ if (qAxOutProcServer) {
+ settings.remove(QLatin1String("/AppID/") + appId + QLatin1String("/."));
+ settings.remove(QLatin1String("/AppID/") + module + QLatin1String(".EXE"));
+ }
QStringList keys = qAxFactory()->featureList();
for (QStringList::Iterator key = keys.begin(); key != keys.end(); ++key) {
QString className = *key;