summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-14 06:12:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-14 06:12:40 (GMT)
commite2b31c909912c24bd87a4454dca8ae766e9aca52 (patch)
treed99638e6170ffde056e3263ef2e5231ce5f806ce /src/sql
parent4af9cc043370846c52ec21cf874696ee650394c1 (diff)
parent756c8e10b96f4b4f7b2e3d2d2c248ec261a3d407 (diff)
downloadQt-e2b31c909912c24bd87a4454dca8ae766e9aca52.zip
Qt-e2b31c909912c24bd87a4454dca8ae766e9aca52.tar.gz
Qt-e2b31c909912c24bd87a4454dca8ae766e9aca52.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. Doc: Updating design files. Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files. qdoc: Changed <ul> elements in TOC. Fix QTextDocument::undo() cursor positioning
Diffstat (limited to 'src/sql')
0 files changed, 0 insertions, 0 deletions