diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-03-05 09:51:48 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-03-05 09:51:48 (GMT) |
| commit | 0cbf15ea0e2b2c3b40147706dd2a0ce07d8807b6 (patch) | |
| tree | 86538f590ddb9adb1594f46035cec46994289c07 | |
| parent | d80b0e347bb01d039c0104e857674bb2cf0adc0f (diff) | |
| parent | ab12c1c804ee40931515a0d53e5dc70db373f3bd (diff) | |
| download | Qt-0cbf15ea0e2b2c3b40147706dd2a0ce07d8807b6.zip Qt-0cbf15ea0e2b2c3b40147706dd2a0ce07d8807b6.tar.gz Qt-0cbf15ea0e2b2c3b40147706dd2a0ce07d8807b6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
| -rw-r--r-- | src/corelib/io/qprocess_symbian.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qgraphicssystem_raster.cpp | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp index 75cde51..e37bdda 100644 --- a/src/corelib/io/qprocess_symbian.cpp +++ b/src/corelib/io/qprocess_symbian.cpp @@ -371,6 +371,7 @@ QProcessActive::QProcessActive() // Called from ProcessManagerThread QProcessActive::~QProcessActive() { + Cancel(); process = NULL; pproc = NULL; } @@ -477,6 +478,7 @@ QProcessManagerMediator::QProcessManagerMediator() // Called from ProcessManagerThread QProcessManagerMediator::~QProcessManagerMediator() { + Cancel(); processManagerThread.Close(); currentCommand = ENoCommand; currentObserver = NULL; diff --git a/src/gui/painting/qgraphicssystem_raster.cpp b/src/gui/painting/qgraphicssystem_raster.cpp index f90aea0..909508e 100644 --- a/src/gui/painting/qgraphicssystem_raster.cpp +++ b/src/gui/painting/qgraphicssystem_raster.cpp @@ -41,19 +41,32 @@ #include "qgraphicssystem_raster_p.h" +#ifdef Q_OS_SYMBIAN +#include "private/qpixmap_s60_p.h" +#include "private/qwindowsurface_s60_p.h" +#else #include "private/qpixmap_raster_p.h" #include "private/qwindowsurface_raster_p.h" +#endif QT_BEGIN_NAMESPACE QPixmapData *QRasterGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const { +#ifdef Q_OS_SYMBIAN + return new QS60PixmapData(type); +#else return new QRasterPixmapData(type); +#endif } QWindowSurface *QRasterGraphicsSystem::createWindowSurface(QWidget *widget) const { +#ifdef Q_OS_SYMBIAN + return new QS60WindowSurface(widget); +#else return new QRasterWindowSurface(widget); +#endif } QT_END_NAMESPACE |