summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-06 09:11:15 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-06 09:11:15 (GMT)
commit0d4e512c2dd9a13aa19cbd6d28209f2dc00a0cf8 (patch)
treeab5d82aee1b4a25c5ac6457531069a150f925b50 /src/gui/image
parentfaaaff5257c105860f58a4ad3df531b36e27627d (diff)
parentecb0e303c275d379269ab570d91670b27df2c6b7 (diff)
downloadQt-0d4e512c2dd9a13aa19cbd6d28209f2dc00a0cf8.zip
Qt-0d4e512c2dd9a13aa19cbd6d28209f2dc00a0cf8.tar.gz
Qt-0d4e512c2dd9a13aa19cbd6d28209f2dc00a0cf8.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
Diffstat (limited to 'src/gui/image')
0 files changed, 0 insertions, 0 deletions