summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/src_opengl_qglshaderprogram.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-24 13:04:44 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-24 13:04:44 (GMT)
commit91dbe6f913456fa0d5c01b75ed8a03eb76b1ae35 (patch)
treedfa63d4cee7bf39d54bf0b311414778e13004eec /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp
parentd29adf474c694d77ef136a75717f10398f76f7fb (diff)
parent37a21edbfb01f902bbfc033727066ed1ee1354e7 (diff)
downloadQt-91dbe6f913456fa0d5c01b75ed8a03eb76b1ae35.zip
Qt-91dbe6f913456fa0d5c01b75ed8a03eb76b1ae35.tar.gz
Qt-91dbe6f913456fa0d5c01b75ed8a03eb76b1ae35.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: runonphone: Change the upload option to allow uploading any file runonphone: Include the manufacturer name in the friendly name on OS X runonphone: Fix usb device enumeration on Mac OS X Add a function that returns the D-Bus local machine ID Add an SSE4.2 even simpler version of toLatin1 Skip boundry neutral characters in bidi itemization Update autotest case after toHtml change Proper fix for previous deallocation problem No need to destroy match pattern again Fix fontconfig usage in X11 font database Fix empty lines in Qt HTML when displayed in external browsers (again) Make it possible to set color of QStaticText with pixel size >= 64
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions