summaryrefslogtreecommitdiffstats
path: root/src/activeqt
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius@trolltech.com>2009-06-30 10:58:16 (GMT)
committerMarius Storm-Olsen <marius@trolltech.com>2009-06-30 10:58:16 (GMT)
commit116683d4284646d91013e6f3a8d940c8855fbca3 (patch)
tree93bdc46bec4f274ef28939e1840cdfc39bcfcc05 /src/activeqt
parent5a54b2c4c448ea22adb56bc191303abca34f230b (diff)
parent238a618b5482e0471f46ed71362492be9c4df4a6 (diff)
downloadQt-116683d4284646d91013e6f3a8d940c8855fbca3.zip
Qt-116683d4284646d91013e6f3a8d940c8855fbca3.tar.gz
Qt-116683d4284646d91013e6f3a8d940c8855fbca3.tar.bz2
Merge branch '4.5'
Diffstat (limited to 'src/activeqt')
-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 5f0a05b..a9b3271 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;