summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qnativeimage.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-08 04:30:50 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-08 04:30:50 +0200
commit4c9e2a4376a52891a21f75e2a441848234ed93c2 (patch)
tree5eb3ea85a2c7194639aad9b921a03f4aa4930fe9 /src/gui/image/qnativeimage.cpp
parent8b8a4e960be30d64d2bc093662ddb1cefeae524e (diff)
parent7f875312dcc09a4b2dcc5030e813e921b1dc7ee4 (diff)
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: Fix crash when using Q_GLOBAL_STATIC(QWidget...) Removed the need for S60main.rsc resource file in Symbian.
Diffstat (limited to 'src/gui/image/qnativeimage.cpp')
0 files changed, 0 insertions, 0 deletions