summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qpixmap_x11.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-13 03:18:45 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-13 03:18:45 +1000
commit6c52715202ad8fd3c3f4bb94207cb7627c12f995 (patch)
tree221be03923196683759111c73f94bf47d71e815e /src/gui/image/qpixmap_x11.cpp
parentd888b168932fbdc65881ced1aa55165f286ea6d2 (diff)
parent405aafcfe2d9d591d62c72f00bbc095c2ad52309 (diff)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use runtime path instead of compile time on Maemo
Diffstat (limited to 'src/gui/image/qpixmap_x11.cpp')
0 files changed, 0 insertions, 0 deletions