summaryrefslogtreecommitdiffstats
path: root/Objects/abstract.c
diff options
context:
space:
mode:
Diffstat (limited to 'Objects/abstract.c')
0 files changed, 0 insertions, 0 deletions
?h=v4.7.5&id=c6d893bc8ada7ddd3b9896ab43d05f7d764edf51'>c6d893bc8ada7ddd3b9896ab43d05f7d764edf51 (diff)parent77ffaaac7efe39e4b0f7ea24c73d157ffea88440 (diff)downloadQt-ac829279ac1ffe9a979e281346463c088cc6e2e7.zip
Qt-ac829279ac1ffe9a979e281346463c088cc6e2e7.tar.gz
Qt-ac829279ac1ffe9a979e281346463c088cc6e2e7.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: Enable QTouchEvent for S60 5.0 Add missing license header. Fix build error on S60 3.1 environments QRuntimeGraphicsSystem Fix replacement functions in platform_paths.prf
Diffstat
-rw-r--r--mkspecs/features/symbian/platform_paths.prf2
-rw-r--r--src/corelib/global/qglobal.h3
-rw-r--r--src/gui/image/qpixmap.cpp40
-rw-r--r--src/gui/image/qpixmap.h2
-rw-r--r--src/gui/image/qpixmapcache_p.h5
-rw-r--r--src/gui/image/qpixmapdata_p.h5
-rw-r--r--src/gui/kernel/qapplication.cpp13
-rw-r--r--src/gui/kernel/qapplication_p.h3
-rw-r--r--src/gui/kernel/qapplication_s60.cpp119
-rw-r--r--src/gui/kernel/qt_s60_p.h2
-rw-r--r--src/gui/kernel/qwidget.cpp9
-rw-r--r--src/gui/painting/painting.pri2
-rw-r--r--src/gui/painting/qgraphicssystem_runtime.cpp484
-rw-r--r--src/gui/painting/qgraphicssystem_runtime_p.h197
-rw-r--r--src/gui/painting/qgraphicssystemfactory.cpp7
-rw-r--r--src/gui/painting/qpaintengine_raster.cpp20
-rw-r--r--src/gui/painting/qwindowsurface.cpp2
-rw-r--r--src/gui/painting/qwindowsurface_s60.cpp31
-rw-r--r--src/plugins/bearer/symbian/qnetworksession_impl.h4
-rw-r--r--tools/configure/configureapp.cpp19
20 files changed, 911 insertions, 58 deletions
diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf