summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-15 06:18:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-15 06:18:27 (GMT)
commit4c472f1694aa9f35eda248f04decadbe0ef2dd75 (patch)
tree3480002bde8c6059272fb4d61829e0e3b8f2f504 /src/xmlpatterns/functions/qstaticnamespacescontainer.cpp
parent6ce4e6247fa6e438a34a498cd803a5542ff338b7 (diff)
parentd20bf43e3f7b3d39fddd28eee5a5594de6930873 (diff)
downloadQt-4c472f1694aa9f35eda248f04decadbe0ef2dd75.zip
Qt-4c472f1694aa9f35eda248f04decadbe0ef2dd75.tar.gz
Qt-4c472f1694aa9f35eda248f04decadbe0ef2dd75.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: Fix compilation of ShivaVG, which does not have EGL. Move nativePaintingActive flag to GL2 engine's private More adjustments to QTBUG-6800 Adjustments to QTBUG-6800 patch. QTBUG-6800 patch included, but only for OpenGL 2.0 Support building with desktop OpenGL managed via EGL Print more information when debugging X11 Visual selection Fix gcc compile warning in qstatictext.cpp Avoid taking sqrt of negative number in FT font engine
Diffstat (limited to 'src/xmlpatterns/functions/qstaticnamespacescontainer.cpp')
0 files changed, 0 insertions, 0 deletions