diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 21:43:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 21:43:10 (GMT) |
| commit | 8f230bcca8835006507c59d4743e76bdcff62f23 (patch) | |
| tree | 648091120ecbdb17fc11015d7ad1bddb8066137c /src/network/bearer/qnetworkconfigmanager.cpp | |
| parent | 66ced6e042300977a70d13a92cd7445a9c11c67a (diff) | |
| parent | 38db40d9a2db44e47b0aabd9487284cd1106b353 (diff) | |
| download | Qt-8f230bcca8835006507c59d4743e76bdcff62f23.zip Qt-8f230bcca8835006507c59d4743e76bdcff62f23.tar.gz Qt-8f230bcca8835006507c59d4743e76bdcff62f23.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (23 commits)
Workaround webkit deadlock on macos x
Disable antialiasing for tiled image drawing.
Ensure visibility of input widget in QML app when doing layout switch
Def update for gui, openvg, and opengl.
Revert "Def update."
Fix trailing whitespace
Remove unnecessary resizes during orientation change
Revert "Symbian: Fix QFontInfo::pixelSize()"
Improving warning messages in QVolatileImage.
Proper naming for raster pixmap and paintengine on Symbian.
Def update.
Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
Resizable graphicsview's background is drawn incorrectly in splitview
Add inputcontext reset to orientation switch in Symbian
QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
Symbian: Fix QFontInfo::pixelSize()
Drop-down menu position is altered when Partial VKB is invoked
Fix SVG icons on softkeys in new Symbian devices
Fix screen dimensions after orientation change in split screen mode.
Qmlshadersplugin examples added.
...
Diffstat (limited to 'src/network/bearer/qnetworkconfigmanager.cpp')
| -rw-r--r-- | src/network/bearer/qnetworkconfigmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp index 65a15d7..d2c7317 100644 --- a/src/network/bearer/qnetworkconfigmanager.cpp +++ b/src/network/bearer/qnetworkconfigmanager.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_INIT(TYPE, NAME); \ static void NAME##_cleanup() \ { \ - delete this_##NAME.pointer; \ + this_##NAME.pointer->cleanup(); \ this_##NAME.pointer = 0; \ } \ static TYPE *NAME() \ @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE delete x; \ else { \ qAddPostRoutine(NAME##_cleanup); \ - this_##NAME.pointer->updateConfigurations(); \ + this_##NAME.pointer->initialize(); \ } \ } \ return this_##NAME.pointer; \ |